1

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/mapper/BizProjectMapper.java

@@ -16,4 +16,6 @@ import org.apache.ibatis.annotations.Param;
 public interface BizProjectMapper extends BaseMapper<BizProjectEntity> {
 
     IPage<SearchBizProjectResult> paging(Page<Object> page, @Param("ew") QueryWrapper<BizProjectEntity> ew);
+
+    Integer companyAudit(@Param("ew") QueryWrapper<Object> ew);
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizProjectService.java

@@ -32,7 +32,21 @@ public class BizProjectService extends ServiceImpl<BizProjectMapper, BizProjectE
     /**
      * 新增
      */
+    // @Transactional(rollbackFor = Exception.class)
     public void add(BizProjectEntity bizProjectEntity) {
+/*         Long userId = SecurityUtil.currentUserId();
+        Long otherCompanyId = bizProjectEntity.getOtherCompanyId();
+        Integer auditStatus = baseMapper.companyAudit(Wrappers.query()
+                .eq("id", otherCompanyId)
+                .eq("audit_status", AuditStatus.TongGuo)
+                .eq("deleted", 0));
+        Assert.isTrue(auditStatus == 1, "合作方公司未审核");
+
+        auditStatus = baseMapper.companyAudit(Wrappers.query()
+                .eq("user_id", userId)
+                .eq("audit_status", AuditStatus.TongGuo)
+                .eq("deleted", 0));
+        Assert.isTrue(auditStatus == 1, "当前公司未审核"); */
         this.save(bizProjectEntity.setAuditStatus(AuditStatus.DaiShenHe));
     }
 

njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java

@@ -480,6 +480,8 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         if (auditStatus == AuditStatus.TongGuo) {
             certificateSn = SnUtil.next(CERTIFICATE_SN_CODE);
             checkStatus = CheckStatus.WeiKanLiao;
+
+            // 复制数据 expense_items_config、goods_info  -->  order_expense_items
         }
         this.updateById(new OrderInfoEntity()
                 .setId(detail.getId())
@@ -676,9 +678,10 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         Assert.isTrue(orderStatus == OrderStatus.YiJinChang, () -> Exceptions.clierr("当前订单状态，无法出场"));
         baseMapper.busyDriver(orderInfoEntity.getDriverId(), Boolean.FALSE);
         baseMapper.busyTruck(orderInfoEntity.getTruckId(), Boolean.FALSE);
+        Long orderInfoEntityId = orderInfoEntity.getId();
         this.updateById(new OrderInfoEntity()
                 .setAutoOrder(3 ^ (i << 1))
-                .setId(orderInfoEntity.getId())
+                .setId(orderInfoEntityId)
                 .setOrderStatus(OrderStatus.YiChuChang)
         );
         OrderCategory orderCategory = orderInfoEntity.getOrderCategory();
@@ -686,6 +689,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         Integer settleWeight = orderCarInOutService.truckOut(orderInfoEntity.getCarInOutId(), truckLeavingOrderParam, orderCategory, truckId);
 
         // TODO 结算
+        // 结算函数（orderInfoEntityId，settleWeight）
         // settleWeight 重量
         // TODO 关闭 GPS
 

njzscloud-svr/src/main/resources/mapper/biz/BizProjectMapper.xml

@@ -41,8 +41,8 @@
                d.nickname,
                e.nickname other_nickname
         FROM biz_project a
-        INNER JOIN biz_company b ON b.id = a.other_company_id AND b.deleted = 0 AND b.audit_status = 'TongGuo'
+        INNER JOIN biz_company b ON b.id = a.other_company_id AND b.deleted = 0
-        INNER JOIN biz_company c ON c.user_id = a.user_id AND b.deleted = 0 AND c.audit_status = 'TongGuo'
+        INNER JOIN biz_company c ON c.user_id = a.user_id AND b.deleted = 0
                  INNER JOIN sys_user d ON a.user_id = d.id AND b.deleted = 0
                  INNER JOIN sys_user e ON a.other_user_id = e.id AND b.deleted = 0
         <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
@@ -50,4 +50,8 @@
         </if>
         ORDER BY a.modify_time DESC
     </select>
+    <select id="companyAudit" resultType="java.lang.Integer">
+        SELECT count(*)
+        FROM biz_company
+    </select>
 </mapper>

njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml

@@ -29,10 +29,7 @@
                a.discount_money,
                a.revise_money,
                a.settle_money,
-               a.payer,
-               a.payer_category,
                a.payment_status,
-               a.payment_time,
                a.customer_memo,
                a.checker_memo,
                a.cargo_photo,
@@ -67,8 +64,6 @@
                c.money_config_id,
                c.picture,
                c.tax_rate,
-               c.quantity,
-               c.total_money,
                i.category_name,
                d.rough_weight,
                d.tare_weight,