违约

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

@@ -330,7 +330,8 @@ public class IntegralMqHandlerServiceImpl implements IntegralMqHandlerService {
 
         List<Integer> finishStatusList = Arrays.asList(OrderChildEnum.Status.UNSETTLE.getCode(), OrderChildEnum.Status.COMPLETE.getCode());
         List<Integer> cancelStatusList = Arrays.asList(OrderChildEnum.Status.DRIVER_CANCEL.getCode());;
-        List<Integer> platformCancelStatusList = Arrays.asList(OrderChildEnum.Status.OWNER_CANCEL.getCode(),
+        List<Integer> platformCancelStatusList = Arrays.asList(
+                OrderChildEnum.Status.OWNER_CANCEL.getCode(),
                 OrderChildEnum.Status.PLATFORM_CANCEL.getCode(),
                 OrderChildEnum.Status.ARTIFICIAL_CANCEL.getCode()
         );

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

@@ -184,7 +184,7 @@ public class BreakContractDriverRecordServiceImpl  implements BreakContractDrive
         record.setBreakContractPartyType(BreakContractRecordEnum.BreakContractPartyType.DRIVER.getCode());
         record.setBreakNo(breakNoGenerate());
         record.setFigure(figure);
-        record.setRemark("取消运单");
+        record.setRemark("到达货源地超时取消");
 
         record.setChildNo(orderChild.getChildNo());
         record.setTruckNo(orderChild.getTruckNo());

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

@@ -68,6 +68,8 @@ public class OrderChildPostServiceImpl implements OrderChildPostService {
         // 保存违约记录
         breakContractDriverRecordService.saveDriverRecordOfArriveSendAddressTimeout(orderChild, 0L, "系统");
 
+        orderChildFinish(orderChild.getChildNo());
+
         // 发送mq （运单取消）
         orderChildMqService.orderChildCancel(orderChild.getChildNo(), OrderChildLogEnum.Type.PLATFORM_CANCEL.getCode(), UserTypeEnum.SYSTEM.getCode(), 0L, "系统");