Merge branch 'v6.4_transportation_20231110' into test

performance-web/src/main/java/com/clx/performance/service/OrderChildService.java

@@ -78,7 +78,5 @@ public interface OrderChildService {
      */
     List<OrderChild> selectInTransitOrderChild(String orderNo);
 
-    void orderChildFinish(String childNo);
-
     DriverCancelOrderChildInfo driverCancelOrderChildInfo(String orderChildNo);
 }

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

@@ -4,8 +4,12 @@ import com.clx.performance.model.OrderChild;
 
 public interface OrderChildPostService {
 
+    void orderChildDriverConfirm(OrderChild orderChild);
     void orderChildFinish(String childNo);
 
+    void orderChildCancelByDriver(OrderChild orderChild, Integer opUserType, Long opUserNo, String opUserName);
+    void orderChildCancelByCarrier(OrderChild orderChild, Integer opUserType, Long opUserNo, String opUserName);
+
     void arriveSendAddressTimeoutCancel(OrderChild orderChild);
     void orderCancel(String childNo);
     void orderGoodsCancel(String childNo);

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

@@ -29,6 +29,7 @@ import com.clx.performance.param.pc.PageMonitorOrderChildQCParam;
 import com.clx.performance.param.pc.PagePoundAuditParam;
 import com.clx.performance.service.*;
 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;
@@ -144,6 +145,9 @@ public class OrderChildServiceImpl implements OrderChildService {
     @Autowired
     private BreakContractDriverRecordService breakContractDriverRecordService;
 
+    @Autowired
+    private OrderChildPostService orderChildPostService;
+
     @Override
     public SaveOrderChildVO saveOrderChild(OrderChildSaveParam param) {
 
@@ -1029,9 +1033,6 @@ public class OrderChildServiceImpl implements OrderChildService {
         // 更新车辆状态
         updateDriverOrderStatusDriverConfirm(orderChild.getTruckId());
 
-        // 运单结束
-        orderChildFinish(orderChild);
-
         // 生成计费单
         saveSettlementDetail(orderChild,orderGoods);
 
@@ -1039,8 +1040,8 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.DRIVER_CONFIRM.getCode(),
                 OrderChildLogEnum.Type.DRIVER_CONFIRM.getMsg(), loginUserInfo.getUserNo(), loginUserInfo.getUserName());
 
-        // 发送mq 司机确认收货
-        orderChildMqService.orderChildDriverConfirm(orderChild.getChildNo());
+        // 司机确认收货后置逻辑
+        orderChildPostService.orderChildDriverConfirm(orderChild);
     }
 
     @Override
@@ -1145,18 +1146,15 @@ public class OrderChildServiceImpl implements OrderChildService {
         // 更新出车状态
         updateDriverOrderStatusCancel(orderChild.getDriverUserNo(), orderChild.getTruckId());
 
+        // 保存违约记录
+        breakContractDriverRecordService.saveDriverRecordOfOrderChildCancel(orderChild, loginUserInfo.getUserNo(), loginUserInfo.getUserName());
+
         // 日志
         orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.DRIVER_CANCEL.getCode(),
                 OrderChildLogEnum.Type.DRIVER_CANCEL.getMsg(), loginUserInfo.getUserNo(), loginUserInfo.getUserName());
 
-        // 运单结束
-        orderChildFinish(orderChild);
-
-        // 保存违约记录
-        breakContractDriverRecordService.saveDriverRecordOfOrderChildCancel(orderChild, loginUserInfo.getUserNo(), loginUserInfo.getUserName());
-
-        // 发送mq （运单取消）
-        orderChildMqService.orderChildCancel(orderChild.getChildNo(), orderChild.getStatus(), UserTypeEnum.DRIVER.getCode(), loginUserInfo.getUserNo(), loginUserInfo.getUserName());
+        // 司机取消后置逻辑
+        orderChildPostService.orderChildCancelByDriver(orderChild, UserTypeEnum.DRIVER.getCode(), loginUserInfo.getUserNo(), loginUserInfo.getUserName());
 
     }
 
@@ -1212,11 +1210,8 @@ public class OrderChildServiceImpl implements OrderChildService {
                 OrderChildLogEnum.Type.PLATFORM_CANCEL.getMsg(), loginUserInfo.getUserNo(),
                 loginUserInfo.getUserName());
 
-        // 运单结束
-        orderChildFinish(orderChild);
-
-        // 发送mq （运单取消）
-        orderChildMqService.orderChildCancel(orderChild.getChildNo(), orderChild.getStatus(), UserTypeEnum.DRIVER.getCode(), loginUserInfo.getUserNo(), loginUserInfo.getUserName());
+        // 承运取消后置逻辑
+        orderChildPostService.orderChildCancelByCarrier(orderChild, UserTypeEnum.CARRIER.getCode(), loginUserInfo.getUserNo(), loginUserInfo.getUserName());
 
     }
 
@@ -1230,14 +1225,6 @@ public class OrderChildServiceImpl implements OrderChildService {
 
     }
 
-    @Override
-    public void orderChildFinish(String childNo){
-
-        // 运单结束 统计积分
-        integralMqService.orderChildFinish(childNo);
-
-    }
-
     @Override
     public DriverCancelOrderChildInfo driverCancelOrderChildInfo(String orderChildNo) {
         DriverCancelOrderChildInfo result = new DriverCancelOrderChildInfo();

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

@@ -14,14 +14,23 @@ import org.springframework.stereotype.Service;
 @Service
 public class OrderChildPostServiceImpl implements OrderChildPostService {
 
-//    @Autowired
-//    private IntegralMqService integralMqService;
-//
-//    @Autowired
-//    private OrderChildMqService orderChildMqService;
-//
-//    @Autowired
-//    private BreakContractDriverRecordService breakContractDriverRecordService;
+    @Autowired
+    private IntegralMqService integralMqService;
+
+    @Autowired
+    private OrderChildMqService orderChildMqService;
+
+    @Autowired
+    private BreakContractDriverRecordService breakContractDriverRecordService;
+
+    @Override
+    public void orderChildDriverConfirm(OrderChild orderChild) {
+        // 运单结束 统计积分
+        integralMqService.orderChildFinish(orderChild.getChildNo());
+
+        // 发送mq 司机确认收货
+        orderChildMqService.orderChildDriverConfirm(orderChild.getChildNo());
+    }
 
     /**
      * 运单结束
@@ -29,7 +38,32 @@ public class OrderChildPostServiceImpl implements OrderChildPostService {
     @Override
     public void orderChildFinish(String childNo) {
         // 运单结束 统计积分
-//        integralMqService.orderChildFinish(childNo);
+        integralMqService.orderChildFinish(childNo);
+    }
+
+    /**
+     * 司机取消
+     */
+    @Override
+    public void orderChildCancelByDriver(OrderChild orderChild, Integer opUserType, Long opUserNo, String opUserName){
+        // 运单结束 统计积分
+        integralMqService.orderChildFinish(orderChild.getChildNo());
+
+        // 发送mq （运单取消）
+        orderChildMqService.orderChildCancel(orderChild.getChildNo(), orderChild.getStatus(), opUserType, opUserNo, opUserName);
+    }
+
+    /**
+     * 承运取消
+     */
+    @Override
+    public void orderChildCancelByCarrier(OrderChild orderChild, Integer opUserType, Long opUserNo, String opUserName) {
+        // 运单结束 统计积分
+        integralMqService.orderChildFinish(orderChild.getChildNo());
+
+        // 发送mq （运单取消）
+        orderChildMqService.orderChildCancel(orderChild.getChildNo(), orderChild.getStatus(), opUserType, opUserNo, opUserName);
+
     }
 
     /**
@@ -39,28 +73,28 @@ public class OrderChildPostServiceImpl implements OrderChildPostService {
     public void arriveSendAddressTimeoutCancel(OrderChild orderChild){
 
         // 发送mq （运单取消）
-//        orderChildMqService.orderChildCancel(orderChild.getChildNo(), orderChild.getStatus(), UserTypeEnum.DRIVER.getCode(), 0L, "系统");
+        orderChildMqService.orderChildCancel(orderChild.getChildNo(), orderChild.getStatus(), UserTypeEnum.DRIVER.getCode(), 0L, "系统");
 
         // 保存违约记录
-//        breakContractDriverRecordService.saveDriverRecordOfArriveSendAddressTimeout(orderChild, 0L, "系统");
+        breakContractDriverRecordService.saveDriverRecordOfArriveSendAddressTimeout(orderChild, 0L, "系统");
     }
 
     @Override
     public void orderCancel(String childNo) {
         // 运单结束 统计积分
-//        integralMqService.orderChildFinish(childNo);
+        integralMqService.orderChildFinish(childNo);
     }
 
     @Override
     public void orderGoodsCancel(String childNo) {
         // 运单结束 统计积分
-//        integralMqService.orderChildFinish(childNo);
+        integralMqService.orderChildFinish(childNo);
     }
 
     @Override
     public void orderChildCancelByArtificial(String childNo) {
         // 运单结束 统计积分
-//        integralMqService.orderChildFinish(childNo);
+        integralMqService.orderChildFinish(childNo);
     }
 
 }