Merge branch 'v17.3_youhua_20240615' into dev

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

@@ -640,7 +640,6 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         return list(lQrWrapper()
                 .eq(OrderChild :: getOrderNo,orderNo)
                 .in(OrderChild :: getStatus,status)
-                .orderByAsc(OrderChild::getId)
         );
     }
 
@@ -648,7 +647,7 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
     public void updateBatchOwnerCancel(List<String> childNos){
         update(lUdWrapper()
                 .in(OrderChild::getChildNo, childNos)
-                .set(OrderChild::getStatus, OrderChildEnum.Status.DRIVER_CANCEL.getCode())
+                .set(OrderChild::getStatus, OrderChildEnum.Status.OWNER_CANCEL.getCode())
                 .set(OrderChild::getCancelTime,LocalDateTime.now())
                 .set(OrderChild::getFinishTime,LocalDateTime.now())
                 .set(OrderChild::getCancelRemark,"货主减少拉运吨数,系统自动取消")

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

@@ -2645,7 +2645,7 @@ public class OrderChildServiceImpl implements OrderChildService {
         arriveBeforeStatus.add(OrderChildEnum.Status.PAY.getCode());
         arriveBeforeStatus.add(OrderChildEnum.Status.GO_TO_SEND.getCode());
 
-        List<String> childNos = new ArrayList<>();//取消运单ids
+        List<String> childNos;//取消运单
         //未到达货源地之前运单（不包括取消）
         List<OrderChild> arriveBeforeOrderChild = orderChildDao.listByOrderNo(param.getOrderNo(),arriveBeforeStatus);
         if(orderedWeight.compareTo(availableWeight) > 0){//已挂吨数大于可拉运吨数  取消未到达货源地的运单