承运结算单优化-货主结算单明细修改生成时机

performance-web/src/main/java/com/clx/performance/service/child/OrderChildPostService.java

 package com.clx.performance.service.child;
 
 import com.clx.performance.model.OrderChild;
+import com.clx.performance.model.OrderChildPoundAudit;
 
 public interface OrderChildPostService {
 
@@ -18,4 +19,5 @@ public interface OrderChildPostService {
 
     void orderChildFinish(String childNo);
 
+    void orderChildPoundAudit(OrderChild orderChild, OrderChildPoundAudit poundAuditDetail);
 }

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildPoundAuditServiceImpl.java

@@ -9,6 +9,7 @@ import com.clx.performance.model.*;
 import com.clx.performance.param.pc.PoundAuditParam;
 import com.clx.performance.param.pc.payment.PayPlatformFeeParam;
 import com.clx.performance.service.*;
+import com.clx.performance.service.child.OrderChildPostService;
 import com.clx.performance.vo.pc.OrderChildPoundAuditDetailVO;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.user.data.UserSessionData;
@@ -55,6 +56,7 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
     private final OrderChildService orderChildService;
     private final PaymentService paymentService;
     private final OcrRecognitionDao ocrRecognitionDao;
+    private final OrderChildPostService orderChildPostService;
 
     @Override
     public OrderChildPoundAuditDetailVO getPoundAuditDetail(String childNo) {
@@ -187,6 +189,7 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
         orderChildLogService.saveOrderChildLog(param.getChildNo(),type,OrderChildLogEnum.Type.getByCode(type).isPresent() ? OrderChildLogEnum.Type.getByCode(type).get().getMsg() :"",
                 OrderChildLogEnum.CreateType.PLATFORM.getCode(), loginUserInfo.getUserNo(),loginUserInfo.getUserName());
 
+        orderChildPostService.orderChildPoundAudit(orderChild, poundAuditDetail);
     }
 
     /***

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -1436,9 +1436,6 @@ public class OrderChildServiceImpl implements OrderChildService {
         // 更新车辆状态
         updateDriverOrderStatusDriverConfirm(orderChild.getTruckId());
 
-        // 生成计费单
-        saveSettlementDetail(orderChild,orderGoods);
-
         // 日志
         orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.DRIVER_CONFIRM.getCode(),
                 OrderChildLogEnum.Type.DRIVER_CONFIRM.getMsg(), loginUserInfo.getUserNo(), loginUserInfo.getUserName());
@@ -1638,17 +1635,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         return result;
     }
 
-    /**
-     * 生成计费单
-     */
-    private void saveSettlementDetail(OrderChild orderChild,OrderGoods orderGoods){
 
-        Integer settlementDriverDetailId = settlementDriverDetailService.saveSettlementDetail(orderChild);
-        Integer settlementOwnerDetailId = settlementOwnerDetailService.saveSettlementDetail(orderChild,orderGoods);
-        log.info("生成计费单 {} ",orderChild.getChildNo());
-        settlementMqService.settlementDetailAdd(settlementDriverDetailId, settlementOwnerDetailId);
-
-    }
 
 
 

performance-web/src/main/java/com/clx/performance/service/impl/child/OrderChildPostServiceImpl.java

 package com.clx.performance.service.impl.child;
 
-import com.clx.performance.enums.OrderChildEnum;
-import com.clx.performance.enums.OrderChildLogEnum;
-import com.clx.performance.enums.UserTypeEnum;
+import com.clx.performance.dao.OrderGoodsDao;
+import com.clx.performance.enums.*;
 import com.clx.performance.model.OrderChild;
+import com.clx.performance.model.OrderChildPoundAudit;
+import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.mq.IntegralOrderChildFinishMqParam;
 import com.clx.performance.service.IntegralMqService;
 import com.clx.performance.service.OrderChildMqService;
 import com.clx.performance.service.breakcontract.BreakContractDriverRecordService;
 import com.clx.performance.service.child.OrderChildPostService;
+import com.clx.performance.service.settle.SettlementDriverDetailService;
+import com.clx.performance.service.settle.SettlementMqService;
+import com.clx.performance.service.settle.SettlementOwnerDetailService;
 import com.clx.performance.service.vehiclewarn.VehicleWarnMqService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Objects;
+
 @Slf4j
 @Service
 public class OrderChildPostServiceImpl implements OrderChildPostService {
@@ -30,6 +36,18 @@ public class OrderChildPostServiceImpl implements OrderChildPostService {
     @Autowired
     private VehicleWarnMqService vehicleWarnMqService;
 
+    @Autowired
+    private SettlementDriverDetailService settlementDriverDetailService;
+
+    @Autowired
+    private SettlementOwnerDetailService settlementOwnerDetailService;
+
+    @Autowired
+    private SettlementMqService settlementMqService;
+
+    @Autowired
+    private OrderGoodsDao orderGoodsDao;
+
     @Override
     public void orderChildAdd(String childNo) {
         // 发送mq 新增运单
@@ -173,4 +191,18 @@ public class OrderChildPostServiceImpl implements OrderChildPostService {
 
     }
 
+    @Override
+    public void orderChildPoundAudit(OrderChild orderChild, OrderChildPoundAudit poundAuditDetail){
+        OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(
+                PerformanceResultEnum.DATA_NOT_FIND);
+
+        if (Objects.equals(poundAuditDetail.getStatus(), OrderChildPoundAuditEnum.Status.APPROVED.getCode())) {
+            // 生成计费单
+            Integer settlementDriverDetailId = settlementDriverDetailService.saveSettlementDetail(orderChild);
+            Integer settlementOwnerDetailId = settlementOwnerDetailService.saveSettlementDetail(orderChild, orderGoods);
+            log.info("生成计费单 {} ", orderChild.getChildNo());
+            settlementMqService.settlementDetailAdd(settlementDriverDetailId, settlementOwnerDetailId);
+        }
+    }
+
 }