chenxiaofei пре 5 месеци
родитељ
комит
91eac1aa05

+ 4 - 9
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/task/LogisticsOrderCompletionTask.java

@@ -73,15 +73,12 @@ public class LogisticsOrderCompletionTask {
             List<KwtLogisticsOrder> updateLogisticOrders = new ArrayList<>();
             
             // 遍历每个物流订单及其关联的运单子任务
-            for (Map.Entry<Long, List<KwtWaybillOrderSubtask>> entry : logOrderSubtasksMap.entrySet()) {
-                Long logOrderId = entry.getKey();
-                List<KwtWaybillOrderSubtask> subtaskList = entry.getValue();
-                
+            logOrderSubtasksMap.forEach((logOrderId, subtaskList) -> {
                 try {
                     // 如果没有运单,跳过
                     if (CollectionUtils.isEmpty(subtaskList)) {
                         log.warn("物流订单[{}]下没有运单,跳过处理", logOrderId);
-                        continue;
+                        return;
                     }
 
                     // 检查所有运单状态是否都是"已完成"(COMPLETED)和已取消(CANCELLED)
@@ -106,14 +103,12 @@ public class LogisticsOrderCompletionTask {
                                 .filter(subtask -> Objects.equals(subtask.getStatus(), CarWaybillV1Enum.COMPLETED.getCode()))
                                 .count();
                         log.debug("物流订单下还有未完成的运单,已完成运单数:{}/{},订单ID:{}",
-                                 completedCount, subtaskList.size(), logOrderId);
-                    
+                                completedCount, subtaskList.size(), logOrderId);
                     }
                 } catch (Exception e) {
                     log.error("处理物流订单时发生异常,订单ID:{}", logOrderId, e);
                 }
-            }
-            
+            });
             // 如果没有需要更新的物流订单,则直接返回
             if (CollectionUtils.isEmpty(updateLogisticOrders)){
                 log.info("没有需要更新状态的物流订单");