Browse Source

修改日志

donglang 8 giờ trước cách đây
mục cha
commit
0bc4858d00

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

@@ -2031,7 +2031,7 @@ public class WaybillOrderService {
         // 4. 物流订单
         List<KwtLogisticsOrder> logisticsOrders = logisticsOrderRepository.queryByTradeOrderIds(tOrderIds);
         if (CollectionUtils.isEmpty(logisticsOrders)) {
-            throw new BusinessPlatfromException(ErrorCodeEnum.LOGISTICS_ORDER_NOT_FOUND, "物流订单不存在,tOrderIds:" + JSON.toJSONString(tOrderIds));
+            return new ArrayList<>();
         }
         log.info("物流订单,size:{}", logisticsOrders.size());
         Set<Long> lOrderIds= logisticsOrders.stream().map(KwtLogisticsOrder::getId).collect(Collectors.toSet());
@@ -2054,7 +2054,7 @@ public class WaybillOrderService {
         Date endOfDay = DateUtils.getEndOfDay(param.getOneDayTime());
         List<KwtGatekeeperWaybillOrder> gatekeepers = gatekeeperWaybillOrderRepository.queryGatekeeperByWaybillOrders(param.getEntId(), lOrderIds, Global.ADDRESS_LOAD, startOfDay, endOfDay);
         if (CollectionUtils.isEmpty(gatekeepers)) {
-            throw new BusinessPlatfromException(ErrorCodeEnum.WAYBILL_ORDER_NOT_FOUND, "门卫运单不存在,entId:" + JSON.toJSONString(param.getEntId()));
+            return new ArrayList<>();
         }
         log.info("门卫,size:{}", gatekeepers.size());
         Set<Long> gateWorderIds = gatekeepers.stream().map(KwtGatekeeperWaybillOrder::getWOrderId).collect(Collectors.toSet());
@@ -2363,7 +2363,7 @@ public class WaybillOrderService {
         Date endOfDay = DateUtils.getEndOfDay(param.getOneDayTime());
         List<KwtGatekeeperWaybillOrder> gatekeepers = gatekeeperWaybillOrderRepository.queryGatekeeperByWaybillOrders(mockEntIds, lOrderIds, startOfDay, endOfDay);
         if (CollectionUtils.isEmpty(gatekeepers)) {
-            throw new BusinessPlatfromException(ErrorCodeEnum.WAYBILL_ORDER_NOT_FOUND, "门卫运单不存在,lOrderIds:" + JSON.toJSONString(lOrderIds));
+            return Collections.emptyList();
         }
         log.info("门卫,size:{}", gatekeepers.size());
         Set<Long> gateWorderIds = gatekeepers.stream().map(KwtGatekeeperWaybillOrder::getLOrderId).collect(Collectors.toSet());