修改查询物流订单

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

@@ -80,5 +80,14 @@ public class KwtLogisticsOrderCirculateRepository extends ServiceImpl<KwtLogisti
                 .eq(KwtLogisticsOrderCirculate::getDelFlag,0));
     }
 
+    public List<KwtLogisticsOrderCirculate> queryOrderCirculateByEntId(Long entId, String truckNo) {
+        return list(Wrappers.<KwtLogisticsOrderCirculate>lambdaQuery()
+                .eq(KwtLogisticsOrderCirculate::getEntId, entId)
+                .eq(KwtLogisticsOrderCirculate::getTruckNo, truckNo)
+                .eq(KwtLogisticsOrderCirculate::getDelFlag, 0)
+                .orderByDesc(KwtLogisticsOrderCirculate::getCreateTime)
+                .orderByDesc(KwtLogisticsOrderCirculate::getId));
+    }
+
 
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/WaybillOrderService.java

@@ -203,27 +203,26 @@ public class WaybillOrderService {
         if (StringUtils.isBlank(param.getTruckNo())) {
             return PageDataResult.empty(param.getPageNum(), param.getPageSize());
         }
-        //cxf 帮修改 查询改物流订单下待接单的订单
-        LambdaQueryWrapper<KwtLogisticsOrderCirculate> queryWrapper = Wrappers.<KwtLogisticsOrderCirculate>lambdaQuery()
-                .eq(KwtLogisticsOrderCirculate::getEntId, param.getEntId())
-                .eq(KwtLogisticsOrderCirculate::getTruckNo, param.getTruckNo())
-                .eq(KwtLogisticsOrderCirculate::getDelFlag, 0)
-                .orderByDesc(KwtLogisticsOrderCirculate::getCreateTime)
-                .orderByDesc(KwtLogisticsOrderCirculate::getId);//TODO donglang 运单状态
-        Page<KwtLogisticsOrderCirculate> logOrderCirculateList = logisticsOrderCirculateRepository.page(new Page<>(param.getPageNum(), param.getPageSize()), queryWrapper);
-        List<KwtLogisticsOrderCirculate> records = logOrderCirculateList.getRecords();
-        if (CollectionUtils.isEmpty(records)) {
+        List<KwtLogisticsOrderCirculate> circulateList = logisticsOrderCirculateRepository.queryOrderCirculateByEntId(param.getEntId(), param.getTruckNo());
+        if (CollectionUtils.isEmpty(circulateList)) {
             log.info("当前车辆无派单订单，truckNo:{}", param.getTruckNo());
             return PageDataResult.empty(param.getPageNum(), param.getPageSize());
         }
         //物流派车订单
-        Map<Long, KwtLogisticsOrderCirculate> logOrderIdAndCirculateMap = records.stream().collect(Collectors.toMap(KwtLogisticsOrderCirculate::getLOrderId,
+        Map<Long, KwtLogisticsOrderCirculate> logOrderIdAndCirculateMap = circulateList.stream().collect(Collectors.toMap(KwtLogisticsOrderCirculate::getLOrderId,
                 Function.identity(), (x, y) -> x));
         //物流订单id
-        List<Long> logOrderIdList = records.stream().map(KwtLogisticsOrderCirculate::getLOrderId).filter(Objects::nonNull).collect(Collectors.toList());
+        List<Long> logOrderIdList = circulateList.stream().map(KwtLogisticsOrderCirculate::getLOrderId).filter(Objects::nonNull).collect(Collectors.toList());
 
         //物流订单
-        List<KwtLogisticsOrder> logOrderList = logisticsOrderRepository.queryByLogisticsOrderIds(logOrderIdList);
+        LambdaQueryWrapper<KwtLogisticsOrder> queryWrapper = Wrappers.<KwtLogisticsOrder>lambdaQuery()
+                .in(KwtLogisticsOrder::getId, logOrderIdList)
+                .eq(KwtLogisticsOrder::getDelFlag,0)
+                .eq(KwtLogisticsOrder::getStatus, LogisticsOrderV1Enum.IN_TRANSIT.getCode())
+                .orderByDesc(KwtLogisticsOrder::getCreateTime)
+                .orderByDesc(KwtLogisticsOrder::getId);
+        Page<KwtLogisticsOrder> page = logisticsOrderRepository.page(new Page<>(param.getPageNum(), param.getPageSize()), queryWrapper);
+        List<KwtLogisticsOrder> logOrderList = page.getRecords();
         if (CollectionUtils.isEmpty(logOrderList)) {
             log.info("当前车辆无物流订单，truckNo:{}", param.getTruckNo());
             throw new BusinessPlatfromException(ErrorCodeEnum.DRIVER_STATUS_ERROR, "当前车辆无物流订单");
@@ -307,7 +306,7 @@ public class WaybillOrderService {
                             tradeIdAndLogOrderList,logOrderIdAndSubtaskMap,dictValueAndDictResDtoMap);
                 }).collect(Collectors.toList());
         log.info("查询司机关联车辆的物流订单成功！");
-        return PageDataResult.success(param.getPageNum(), param.getPageSize(), logOrderCirculateList.getTotal(), ordderList);
+        return PageDataResult.success(param.getPageNum(), param.getPageSize(), page.getTotal(), ordderList);
     }
 
     /**