Merge remote-tracking branch 'origin/dev_20260131' into dev_20260131

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/enums/LogisticsOrderV1Enum.java

@@ -18,7 +18,7 @@ public enum LogisticsOrderV1Enum {
     /**
      * 物流订单-待接单
      */
-    PENDING_ORDER(1, "pendingOrder", "1", "待处理"),
+  //  PENDING_ORDER(1, "pendingOrder", "1", "待处理"),
     /**
      * 物流订单-待派车
      */
@@ -36,7 +36,7 @@ public enum LogisticsOrderV1Enum {
      */
     COMPLETED(20, "haveReconciled", "20", "已完成"),
 
-    REJECT_ORDER(99, "rejectOrder", "99", "已拒单"),
+    //REJECT_ORDER(99, "rejectOrder", "99", "已拒单"),
 
     ;
 

sckw-modules/sckw-order/src/main/java/com/sckw/order/task/TradeOrderTask.java

@@ -117,7 +117,7 @@ public class TradeOrderTask {
                         }
                     });
                 } else {
-                    if (logisticOrderList.stream().allMatch(d -> Arrays.asList(LogisticsOrderV1Enum.COMPLETED.getCode(), LogisticsOrderV1Enum.REJECT_ORDER.getCode()).contains(d.getStatus()))) {
+                    if (logisticOrderList.stream().allMatch(d -> Arrays.asList(LogisticsOrderV1Enum.COMPLETED.getCode()).contains(d.getStatus()))) {
                         threadPoolExecutor.execute(() -> {
                             try {
                                 List<KwoTradeOrderUnit> orderUnits = kwoTradeOrderUnitMapper.selectList(new LambdaQueryWrapper<KwoTradeOrderUnit>().eq(KwoTradeOrderUnit::getTOrderId, kwoTradeOrder.getId())

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/repository/KwtWaybillOrderSubtaskRepository.java

@@ -65,13 +65,13 @@ public class KwtWaybillOrderSubtaskRepository extends ServiceImpl<KwtWaybillOrde
     }
 
     public IPage<KwtWaybillOrderSubtask> queryByPage( Set<Long> logOrderIds, Set<Long> billOrderIds,
-                                                     Integer status,
+                                                     List<Integer> status,
                                                      int pageNum,
                                                      int pageSize) {
         return page(new Page<>(pageNum, pageSize),
                 Wrappers.<KwtWaybillOrderSubtask>lambdaQuery()
                         .eq(BaseModel::getDelFlag,0)
-                        .eq(Objects.nonNull( status),KwtWaybillOrderSubtask::getStatus, status)
+                        .in(CollectionUtils.isNotEmpty( status),KwtWaybillOrderSubtask::getStatus, status)
                         .in(CollectionUtils.isNotEmpty(logOrderIds),KwtWaybillOrderSubtask::getLOrderId, logOrderIds)
                         .in(CollectionUtils.isNotEmpty(billOrderIds),KwtWaybillOrderSubtask::getWOrderId, billOrderIds)
                         .orderByDesc(BaseModel::getUpdateTime)

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtLogisticsConsignmentService.java

@@ -3844,7 +3844,7 @@ public class KwtLogisticsConsignmentService {
 
     private void noticeTrader(Long tradeOrderId, List<KwtLogisticsOrder> orders) {
         boolean b = orders.stream()
-                .allMatch(x -> Arrays.asList(LogisticsOrderV1Enum.COMPLETED.getCode(), LogisticsOrderV1Enum.REJECT_ORDER.getCode())
+                .allMatch(x -> Arrays.asList(LogisticsOrderV1Enum.COMPLETED.getCode())
                         .contains(x.getStatus()));
         if (!b) {
             return;

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderV1Service.java

@@ -3051,8 +3051,12 @@ public class KwtWaybillOrderV1Service {
         // 分页查询子运单信息
         log.info("开始分页查询子运单信息，物流订单ID数量: {}, 运单ID数量: {}, 状态: {}", 
                 logOrderIds.size(), billOrderIds.size(), status);
+        List<Integer> waybillOrderStatus = getWaybillOrderStatus();
+        if (Objects.nonNull( status)){
+            waybillOrderStatus = List.of(status);
+        }
         IPage<KwtWaybillOrderSubtask> page = waybillOrderSubtaskRepository.queryByPage(
-                logOrderIds, billOrderIds, status, req.getPageNum(), req.getPageSize());
+                logOrderIds, billOrderIds, waybillOrderStatus, req.getPageNum(), req.getPageSize());
 
         List<KwtWaybillOrderSubtask> records = page.getRecords();
         if (CollectionUtils.isEmpty(records)) {
@@ -5394,8 +5398,9 @@ public class KwtWaybillOrderV1Service {
         StatisticsWaybillResp statisticsWaybillResp = new StatisticsWaybillResp();
 
         statisticsWaybillResp.setTotalNum("0");
+        List<Integer> waybillOrderStatus = getWaybillOrderStatus();
         List<CarWaybillV1Enum> carWaybillV1Enums = Arrays.stream(CarWaybillV1Enum.values())
-                .filter(x -> !Objects.equals(x.getCode(), CarWaybillV1Enum.WEIGHT_TRAFFIC.getCode()))
+                .filter(x -> !waybillOrderStatus.contains(x.getCode()))
                 .sorted(Comparator.comparing(CarWaybillV1Enum::getCode))
                 .collect(Collectors.toList());
 
@@ -5455,6 +5460,13 @@ public class KwtWaybillOrderV1Service {
        return statisticsWaybillResp;
     }
 
+    private List<Integer>  getWaybillOrderStatus() {
+       return Arrays.asList(CarWaybillV1Enum.WEIGHT_TRAFFIC.getCode(), CarWaybillV1Enum.EMPTY_WAIT_LEAVE.getCode(),
+                CarWaybillV1Enum.WAIT_LEAVE.getCode(), CarWaybillV1Enum.UNLOADING.getCode(),
+                CarWaybillV1Enum.WAIT_RELEASE.getCode(), CarWaybillV1Enum.REPLENISHING.getCode(),
+                CarWaybillV1Enum.REPLENISH_FINISH.getCode(), CarWaybillV1Enum.RELEASED_NOT_EXITED.getCode());
+    }
+
     private static StatisticsWaybillResp.OrderBillStatusStatistics getOrderBillStatusStatistics(CarWaybillV1Enum c, Map<Integer, List<KwtWaybillOrderSubtask>> finalStausAndBillOrdersMap) {
         StatisticsWaybillResp.OrderBillStatusStatistics orderBillStatusStatistics = new StatisticsWaybillResp.OrderBillStatusStatistics();
         orderBillStatusStatistics.setOrderStatus(String.valueOf(c.getCode()));