Merge branch 'v6.4_transportation_20231110' into test

performance-api/src/main/java/com/clx/performance/enums/OrderChildEnum.java

@@ -84,6 +84,10 @@ public enum OrderChildEnum {
         public static Optional<Status> getByCode(Integer code) {
             return Arrays.stream(values()).filter(e -> e.code.equals(code)).findFirst();
         }
+
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(Status::getName).orElse(null);
+        }
     }
 
     @Getter
@@ -96,6 +100,7 @@ public enum OrderChildEnum {
         TRAFFIC_RESTRICTION(5, "交通管制"),
         TRAFFIC_ACCIDENT(6, "交通事故"),
         ADDRESS(7, "无法找到地址"),
+        WAIT(8, "排队时间较长"),
         OTHER(9, "其他原因"),
 
         ;

performance-web/src/main/java/com/clx/performance/dao/impl/breakcontract/BreakContractSettlementDriverDaoImpl.java

@@ -31,6 +31,7 @@ public class BreakContractSettlementDriverDaoImpl extends BaseDaoImpl<BreakContr
         return update(lUdWrapper()
                 .eq(BreakContractSettlementDriver::getId, item.getId())
                 .set(BreakContractSettlementDriver::getSettleStatus, item.getSettleStatus())
+                .set(BreakContractSettlementDriver::getSettleTime, item.getSettleTime())
         );
     }
 

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

@@ -1241,7 +1241,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         List<OrderChildImage> images = orderChildImageDao.getImages(orderChildNo, OrderChildImage.Type.DRIVER_CANCEL.getCode());
         OrderChild orderChild = orderChildDao.getByChildNo(orderChildNo).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
         result.setCancelDetail(orderChild.getCancelDetail());
-        result.setCancelRemark(orderChild.getCancelRemark());
+        result.setCancelRemark(OrderChildEnum.Status.getMsgByCode(orderChild.getStatus())+","+orderChild.getCancelRemark());
         if (CollectionUtils.isNotEmpty(images)) {
             result.setImageList(images.stream().map(OrderChildImage::getImage).collect(Collectors.toList()));
         }

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

@@ -164,6 +164,7 @@ public class BreakContractMqHandlerServiceImpl implements BreakContractMqHandler
         }
 
         breakContractSettlementDriver.setSettleStatus(BreakContractSettlementDriverEnum.SettleStatus.YES.getCode());
+        breakContractSettlementDriver.setSettleTime(LocalDateTime.now());
         breakContractSettlementDriverDao.updateSettlementStatus(breakContractSettlementDriver);
 
         //保存结算单日志