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

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrder.java

@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sckw.core.model.base.BaseModel;
-import com.sckw.core.model.constant.NumberConstant;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
+import lombok.*;
 import lombok.experimental.Accessors;
 
 import java.io.Serial;
@@ -25,15 +22,10 @@ import java.util.Date;
 @ToString
 @Accessors(chain = true)
 @TableName("kwo_trade_order")
+@NoArgsConstructor
+@AllArgsConstructor
 public class KwoTradeOrder extends BaseModel implements Serializable {
 
-    public KwoTradeOrder(){
-        this.amount = NumberConstant.ZERO_TWO;
-        this.price = NumberConstant.ZERO_TWO;
-        this.entrustAmount = NumberConstant.ZERO_TWO;
-        this.actualAmount = NumberConstant.ZERO_TWO;
-        this.associateStatement = 0;
-    }
 
     @Serial
     private static final long serialVersionUID = -4156986025493740589L;
@@ -144,5 +136,4 @@ public class KwoTradeOrder extends BaseModel implements Serializable {
     private Integer addVehicles;
 
 
-
 }

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

@@ -3672,7 +3672,6 @@ public class KwtWaybillOrderV1Service {
             KwtLogisticsOrder kwtLogisticsOrder = getKwtLogisticsOrder(kwtLogistics, subtask);
             boolean b1 = kwtLogisticsOrderRepository.updateById(kwtLogisticsOrder);
             //如果物流订单状态是已完成需要通知贸易订单完成
-           // noticeTraderOrder(kwtLogisticsOrder, kwtLogistics);
 
             // 存储记录
             String remark = null;
@@ -3713,10 +3712,6 @@ public class KwtWaybillOrderV1Service {
                 updateSubtask.setUnloadUploadTime(DateUtils.parse(req.getUploadTime(), DateUtils.DATE_TIME_PATTERN));
             }
             boolean b = kwtWaybillOrderRepository.updateById(updateOrder) && kwtWaybillOrderSubtaskRepository.updateById(updateSubtask);
-//            kwtWaybillOrderTicket.setWOrderId(waybillId);
-//            kwtWaybillOrderTicket.setUrls(req.getAddressUrl());
-//            kwtWaybillOrderTicket.setUploadingTime(new Date());
-//            Boolean b1 = kwtWaybillOrderTicketRepository.updateByBillOrderIdAndType(kwtWaybillOrderTicket, 2);
             // 存储记录
             Long currentRoleId = LoginUserHolder.getCurrentRoleId();
             KwsRoleDto kwsRoleDto = remoteSystemService.queryByRoleIdAndEntId(currentRoleId);
@@ -3726,6 +3721,9 @@ public class KwtWaybillOrderV1Service {
             if (!b ){
                throw new BusinessException("完善单证失败");
             }
+            //如果审核的状态是 完成，那么就要去查询物流订单状态是完结中，并且所有物流订单下的运单全部是完成或者取消如果是则更新状态为已完成
+            //修改物流订单数据
+            updateLogisticOrder(subtask);
             //查询司机是否存在已绑定的车辆
             log.info("运单由审核驳回审核完成，解绑司机与车辆关系，运单id：{},企业id:{},司机id：{}", billOrder.getId(), billOrder.getEntId(), billOrder.getDriverId());
             remoteFleetService.unbindTruck(billOrder.getEntId(), billOrder.getDriverId());
@@ -3737,6 +3735,22 @@ public class KwtWaybillOrderV1Service {
         return Boolean.FALSE;
     }
 
+    private void updateLogisticOrder(KwtWaybillOrderSubtask subtask) {
+        KwtLogisticsOrder kwtLogistics= kwtLogisticsOrderRepository.queryByLogisticsOrderId(subtask.getLOrderId());
+        if (Objects.nonNull(kwtLogistics) && Objects.equals(kwtLogistics.getStatus(), LogisticsOrderV1Enum.NEARING_COMPLETION.getCode())){
+            List<KwtWaybillOrderSubtask> waybillOrderSubtasks = kwtWaybillOrderSubtaskRepository.queryByLogId(subtask.getLOrderId());
+            boolean b2 = waybillOrderSubtasks.stream()
+                    .allMatch(x -> Arrays.asList(CarWaybillV1Enum.COMPLETED.getCode(), CarWaybillV1Enum.CANCELLED.getCode()).contains(x.getStatus()));
+            if (b2){
+                KwtLogisticsOrder logisticsOrder = new KwtLogisticsOrder();
+                logisticsOrder.setId(kwtLogistics.getId());
+                logisticsOrder.setStatus(LogisticsOrderV1Enum.COMPLETED.getCode());
+                log.info("运单状态由审核驳回变成审核完成，修改物流订单状态为已完成，物流订单id：{}", kwtLogistics.getId());
+                kwtLogisticsOrderRepository.updateById(logisticsOrder);
+            }
+        }
+    }
+
     /**
      * 自动派单计算司机分值
      * @param billOrder
@@ -4185,13 +4199,6 @@ public class KwtWaybillOrderV1Service {
             throw new BusinessException("物流订单信息不存在");
         }
         //调物流订单完结订单
-//        List<KwtWaybillOrderSubtask> waybillOrderSubtasks = kwtWaybillOrderSubtaskRepository.queryByLogId(subtask.getLOrderId());
-//        boolean b2 = waybillOrderSubtasks.stream()
-//                .allMatch(x -> Arrays.asList(CarWaybillV1Enum.WAIT_UNLOADING.getCode(), CarWaybillV1Enum.APPROVAL_TREAT.getCode()).contains(x.getStatus()));
-        // KwtLogisticsOrder logisticsOrder = kwtLogisticsOrderRepository.queryByLogisticsOrderId(subtask.getLOrderId());
-
-//        BigDecimal entrustAmount  = Objects.isNull(kwtLogistics.getEntrustAmount())  ? BigDecimal.ZERO: kwtLogistics.getEntrustAmount();
-//        BigDecimal subEntrustAmount = Objects.isNull(subtask.getEntrustAmount()) ? BigDecimal.ZERO: subtask.getEntrustAmount();
         BigDecimal loadAmount  = Objects.isNull(kwtLogistics.getLoadAmount())  ? BigDecimal.ZERO: kwtLogistics.getLoadAmount();
         BigDecimal subLoadAmount = Objects.isNull(subtask.getLoadAmount()) ? BigDecimal.ZERO: subtask.getLoadAmount();
         BigDecimal unloadAmount  = Objects.isNull(kwtLogistics.getUnloadAmount())  ? BigDecimal.ZERO: kwtLogistics.getUnloadAmount();
@@ -4200,13 +4207,19 @@ public class KwtWaybillOrderV1Service {
 
         KwtLogisticsOrder kwtLogisticsOrder = new KwtLogisticsOrder();
         kwtLogisticsOrder.setId(kwtLogistics.getId());
-       // kwtLogisticsOrder.setEntrustAmount(entrustAmount.add(subEntrustAmount));
         kwtLogisticsOrder.setLoadAmount(loadAmount.add(subLoadAmount));
         kwtLogisticsOrder.setUnloadAmount(unloadAmount.add(subUnloadAmount));
-//        if (b2){
-//            //调物流订单完结订单
-//            kwtLogisticsOrder.setStatus(LogisticsOrderV1Enum.HAVE_RECONCILED.getCode());
-//        }
+
+        //如果审核的状态是 完成，那么就要去查询物流订单状态是完结中，并且所有物流订单下的运单全部是完成或者取消如果是则更新状态为已完成
+        if (Objects.equals(kwtLogistics.getStatus(), LogisticsOrderV1Enum.NEARING_COMPLETION.getCode())){
+            List<KwtWaybillOrderSubtask> waybillOrderSubtasks = kwtWaybillOrderSubtaskRepository.queryByLogId(subtask.getLOrderId());
+            boolean b2 = waybillOrderSubtasks.stream()
+               .allMatch(x -> Arrays.asList(CarWaybillV1Enum.COMPLETED.getCode(), CarWaybillV1Enum.CANCELLED.getCode()).contains(x.getStatus()));
+            if (b2){
+                log.info("物流订单状态修改为已完成");
+                kwtLogisticsOrder.setStatus(LogisticsOrderV1Enum.COMPLETED.getCode());
+            }
+        }
         return kwtLogisticsOrder;
     }
 

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("没有需要更新状态的物流订单");