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

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

@@ -1,13 +1,9 @@
 package com.sckw.core.model.enums;
 
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.Getter;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.EnumSet;
-import java.util.List;
 
 /**
  * @author lfdc
@@ -46,15 +42,15 @@ public enum CarWaybillV1Enum {
     /**
      * 已完成
      */
-    WAIT_UNLOADING(25,  "已完成"),
+    COMPLETED(25,  "已完成"),
     /**
      * 审核驳回
      */
-    COMPLETION_UNLOADING(30,  "审核驳回"),
+    REVIEW_REJECTION(30,  "审核驳回"),
     /**
      * 已作废
      */
-    APPROVAL_TREAT(99, "已取消"),
+    CANCELLED(99, "已取消"),
 
     ;
 

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

@@ -1,14 +1,10 @@
 package com.sckw.core.model.enums;
 
-import com.sckw.core.model.constant.NumberConstant;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.ArrayList;
 import java.util.EnumSet;
-import java.util.List;
 
 /**
  * @author lfdc
@@ -34,11 +30,11 @@ public enum LogisticsOrderV1Enum {
     /**
      * 物流订单-已完成
      */
-    HAVE_FINISHED(15, "haveFinished", "15", "完结中"),
+    NEARING_COMPLETION(15, "haveFinished", "15", "完结中"),
     /**
-     * 物流订单-已对账
+     * 物流订单-已完成
      */
-    HAVE_RECONCILED(20, "haveReconciled", "20", "已完成"),
+    COMPLETED(20, "haveReconciled", "20", "已完成"),
 
     REJECT_ORDER(99, "rejectOrder", "99", "已拒单"),
 

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractLogisticsService.java

@@ -1206,13 +1206,13 @@ public class KwcContractLogisticsService {
             String billMode = subOrders.get(0).getBillMode();
             if (org.apache.commons.lang3.StringUtils.equals(billMode, DictEnum.LOAD_UNLOAD_WAY_1.getValue())){
                 totalTransportAmount = subOrders.stream()
-                        .filter(x->Arrays.asList(CarWaybillV1Enum.COMPLETION_LOADING.getCode(),CarWaybillV1Enum.WAIT_UNLOADING.getCode()).contains(x.getStatus()))
+                        .filter(x->Arrays.asList(CarWaybillV1Enum.COMPLETION_LOADING.getCode(),CarWaybillV1Enum.COMPLETED.getCode()).contains(x.getStatus()))
                         .map(RWaybillSubOrderVo.BillSubOrder::getLoadAmount)
                         .filter(Objects::nonNull)
                         .reduce(BigDecimal.ZERO, BigDecimal::add);
             }else {
                 totalTransportAmount = subOrders.stream()
-                        .filter(x->Objects.equals(x.getStatus(), CarWaybillV1Enum.WAIT_UNLOADING.getCode()))
+                        .filter(x->Objects.equals(x.getStatus(), CarWaybillV1Enum.COMPLETED.getCode()))
                         .map(RWaybillSubOrderVo.BillSubOrder::getUnloadAmount)
                         .filter(Objects::nonNull)
                         .reduce(BigDecimal.ZERO, BigDecimal::add);

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractTradeService.java

@@ -1747,14 +1747,14 @@ public class KwcContractTradeService {
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(subOrders)) {
             if (Objects.equals(t.getUnloadWay(), Integer.parseInt(DictEnum.LOAD_UNLOAD_WAY_1.getValue()))) {
                 unloadQty = subOrders.stream()
-                        .filter(x -> Arrays.asList(CarWaybillV1Enum.COMPLETION_LOADING.getCode(), CarWaybillV1Enum.WAIT_UNLOADING.getCode())
+                        .filter(x -> Arrays.asList(CarWaybillV1Enum.COMPLETION_LOADING.getCode(), CarWaybillV1Enum.COMPLETED.getCode())
                                 .contains(x.getStatus()))
                         .map(RWaybillSubOrderVo.BillSubOrder::getLoadAmount)
                         .filter(Objects::nonNull)
                         .reduce(BigDecimal.ZERO, BigDecimal::add);
             } else {
                 unloadQty = subOrders.stream()
-                        .filter(x -> Objects.equals(x.getStatus(), CarWaybillV1Enum.WAIT_UNLOADING.getCode()))
+                        .filter(x -> Objects.equals(x.getStatus(), CarWaybillV1Enum.COMPLETED.getCode()))
                         .map(RWaybillSubOrderVo.BillSubOrder::getUnloadAmount)
                         .filter(Objects::nonNull)
                         .reduce(BigDecimal.ZERO, BigDecimal::add);

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -2458,7 +2458,7 @@ public class KwoTradeOrderService {
         KwoTradeOrder kwoTradeOrder = new KwoTradeOrder();
         List<KwtLogisticsOrderVO> logisticOrderList = transportRemoteService.getLogisticOrderList(new OrderFinishParam(tradeOrderSettleParam.getId()));
         if (CollUtil.isNotEmpty(logisticOrderList)) {
-            if (logisticOrderList.stream().allMatch(d -> Objects.equals(d.getStatus(), LogisticsOrderV1Enum.HAVE_FINISHED.getCode()))) {
+            if (logisticOrderList.stream().allMatch(d -> Objects.equals(d.getStatus(), LogisticsOrderV1Enum.NEARING_COMPLETION.getCode()))) {
                 kwoTradeOrder.setStatus(TradeOrderStatusEnum.SUCCESS.getCode());
             } else {
                 kwoTradeOrder.setStatus(TradeOrderStatusEnum.DEAL.getCode());

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dubbo/TransportServiceImpl.java

@@ -147,7 +147,7 @@ public class TransportServiceImpl implements TransportRemoteService {
             CarWaybillV1Enum.EXIT_COMPLETED.getCode(),
             CarWaybillV1Enum.WEIGHT_TRAFFIC.getCode(),
             CarWaybillV1Enum.WAIT_LOADING.getCode(),
-            CarWaybillV1Enum.COMPLETION_UNLOADING.getCode()
+            CarWaybillV1Enum.REVIEW_REJECTION.getCode()
     );
     /**
      * 对账管理-ids查询
@@ -1388,10 +1388,10 @@ public class TransportServiceImpl implements TransportRemoteService {
 
                 if (Objects.equals(billingMode, String.valueOf(1))) {
                     statusValid = CarWaybillV1Enum.COMPLETION_LOADING.getCode().equals(order.getStatus())
-                            ||CarWaybillV1Enum.WAIT_UNLOADING.getCode().equals(order.getStatus());
+                            ||CarWaybillV1Enum.COMPLETED.getCode().equals(order.getStatus());
                 } else {
                     //按照卸货量结算(统计“已完成”运单)
-                    statusValid = order.getStatus().equals(CarWaybillV1Enum.WAIT_UNLOADING.getCode());
+                    statusValid = order.getStatus().equals(CarWaybillV1Enum.COMPLETED.getCode());
                 }
 
                 if (!statusValid) {

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/CancelHandler.java

@@ -114,7 +114,7 @@ public class CancelHandler extends AbstractWaybillOrderHandler<WaybillOrderCance
 
     @Override
     protected Integer getStatus() {
-        return CarWaybillV1Enum.APPROVAL_TREAT.getCode();
+        return CarWaybillV1Enum.CANCELLED.getCode();
     }
 
     @Override
@@ -148,7 +148,7 @@ public class CancelHandler extends AbstractWaybillOrderHandler<WaybillOrderCance
         KwtWaybillOrderNode takingOrderNodes = getNodesByOrderId(waybillOrder.getId(), CarWaybillV1Enum.PENDING_VEHICLE.getCode());
         Date takingOrderTime = takingOrderNodes.getCreateTime() != null ? takingOrderNodes.getCreateTime() : null;
         //司机取消接单时间
-        KwtWaybillOrderNode cancelNode = getNodesByOrderId(waybillOrder.getId(), CarWaybillV1Enum.APPROVAL_TREAT.getCode());
+        KwtWaybillOrderNode cancelNode = getNodesByOrderId(waybillOrder.getId(), CarWaybillV1Enum.CANCELLED.getCode());
         Date cancelNodeTime = cancelNode.getCreateTime() != null ? cancelNode.getCreateTime() : null;
 
         // 计算两个时间的分钟差

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/TakingOrderHandler.java

@@ -48,7 +48,7 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
             CarWaybillV1Enum.REFUSE_TRAFFIC.getCode(),
             CarWaybillV1Enum.EXIT_COMPLETED.getCode(),
             CarWaybillV1Enum.WAIT_LOADING.getCode(),
-            CarWaybillV1Enum.COMPLETION_UNLOADING.getCode()
+            CarWaybillV1Enum.REVIEW_REJECTION.getCode()
     );
 
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/handler/UnloadingHandler.java

@@ -57,7 +57,7 @@ public class UnloadingHandler extends AbstractWaybillOrderHandler<WaybillOrderUn
             throw new BusinessPlatfromException(ErrorCodeEnum.WAYBILL_ORDER_NOT_FOUND, "运单不存在");
         }
         if (!Objects.equals(CarWaybillV1Enum.WAIT_LOADING.getCode(), waybill.getStatus())
-                && !Objects.equals(CarWaybillV1Enum.COMPLETION_UNLOADING.getCode(), waybill.getStatus())) {
+                && !Objects.equals(CarWaybillV1Enum.REVIEW_REJECTION.getCode(), waybill.getStatus())) {
             throw new BusinessPlatfromException(ErrorCodeEnum.WAYBILL_ORDER_STATUS_ERROR, "当前物流运单不是“已离场”或“审核驳回”状态，无法推进下一节点！");
         }
     }
@@ -170,7 +170,7 @@ public class UnloadingHandler extends AbstractWaybillOrderHandler<WaybillOrderUn
         if (this.targetStatus == null) {
             throw new BusinessPlatfromException(ErrorCodeEnum.SYSTEM_ERROR, "[卸货]计算方式为空！");
         }
-        return  Objects.equals(this.targetStatus, Global.NUMERICAL_ONE) ? CarWaybillV1Enum.WAIT_UNLOADING.getCode()
+        return  Objects.equals(this.targetStatus, Global.NUMERICAL_ONE) ? CarWaybillV1Enum.COMPLETED.getCode()
                 : CarWaybillV1Enum.COMPLETION_LOADING.getCode();
     }
 
@@ -345,7 +345,7 @@ public class UnloadingHandler extends AbstractWaybillOrderHandler<WaybillOrderUn
         KwtWaybillOrderNode takingOrderNodes = getNodesByOrderId(waybillOrder.getId(), CarWaybillV1Enum.PENDING_VEHICLE.getCode());
         Date takingOrderTime = takingOrderNodes.getCreateTime() != null ? takingOrderNodes.getCreateTime() : null;
         //司机完成运单时间
-        KwtWaybillOrderNode overOrderNodes = getNodesByOrderId(waybillOrder.getId(), CarWaybillV1Enum.WAIT_UNLOADING.getCode());
+        KwtWaybillOrderNode overOrderNodes = getNodesByOrderId(waybillOrder.getId(), CarWaybillV1Enum.COMPLETED.getCode());
         Date overOrderTime = overOrderNodes.getCreateTime() != null ? overOrderNodes.getCreateTime() : null;
         //运单总耗时（分钟）
         Long orderTotalTimes = DateUtils.calculateTimeDiffMinutes(takingOrderTime, overOrderTime);
@@ -419,7 +419,7 @@ public class UnloadingHandler extends AbstractWaybillOrderHandler<WaybillOrderUn
         }
 
         //查询该司机连续准时卸货的节点数据
-        List<KwtWaybillOrderNode> waybillOrderNodeList = getWaybillOrderNodesByStatus(waybillOrder, continuousOnTimes, CarWaybillV1Enum.WAIT_UNLOADING);
+        List<KwtWaybillOrderNode> waybillOrderNodeList = getWaybillOrderNodesByStatus(waybillOrder, continuousOnTimes, CarWaybillV1Enum.COMPLETED);
         if (waybillOrderNodeList == null)  {
             return;
         }

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

@@ -2657,7 +2657,7 @@ public class KwtLogisticsConsignmentService {
         }
         // 筛选出状态为已完成的子运单
         List<KwtWaybillOrderSubtask> pendingUnloadSubtasks = waybillOrderSubtasks.stream()
-                .filter(subtask -> Objects.equals(subtask.getStatus(), CarWaybillV1Enum.WAIT_UNLOADING.getCode()))
+                .filter(subtask -> Objects.equals(subtask.getStatus(), CarWaybillV1Enum.COMPLETED.getCode()))
                 .collect(Collectors.toList());
 
         if (org.apache.commons.collections4.CollectionUtils.isEmpty(pendingUnloadSubtasks)) {
@@ -3025,7 +3025,7 @@ public class KwtLogisticsConsignmentService {
                 throw new BusinessException("该物流订单状态不能进行完结，订单编号，{}，订单id：{}",x.getLOrderNo(),x.getId());
             }
             if (Objects.equals(x.getStatus(), LogisticsOrderV1Enum.WAIT_DELIVERY.getCode())){
-                updateLogisticsOrder.setStatus(LogisticsOrderV1Enum.HAVE_RECONCILED.getCode());
+                updateLogisticsOrder.setStatus(LogisticsOrderV1Enum.COMPLETED.getCode());
                 logisticsOrders.add(updateLogisticsOrder);
                 tradeIds.add(x.getTOrderId());
                 return;
@@ -3036,13 +3036,13 @@ public class KwtLogisticsConsignmentService {
             List<KwtWaybillOrderSubtask> waybillOrderSubtasks = waybillOrderSubtaskRepository.queryByLogId(x.getId());
             if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(waybillOrderSubtasks) && Objects.equals(x.getStatus(), LogisticsOrderV1Enum.IN_TRANSIT.getCode())){
                 boolean b = waybillOrderSubtasks.stream()
-                        .anyMatch(y -> !Arrays.asList(CarWaybillV1Enum.WAIT_UNLOADING.getCode(),CarWaybillV1Enum.APPROVAL_TREAT.getCode()).contains(y.getStatus()));
+                        .anyMatch(y -> !Arrays.asList(CarWaybillV1Enum.COMPLETED.getCode(),CarWaybillV1Enum.CANCELLED.getCode()).contains(y.getStatus()));
 
                 if (b){
-                    updateLogisticsOrder.setStatus(LogisticsOrderV1Enum.HAVE_FINISHED.getCode());
+                    updateLogisticsOrder.setStatus(LogisticsOrderV1Enum.NEARING_COMPLETION.getCode());
                     logisticsOrders.add(updateLogisticsOrder);
                 }else {
-                    updateLogisticsOrder.setStatus(LogisticsOrderV1Enum.HAVE_RECONCILED.getCode());
+                    updateLogisticsOrder.setStatus(LogisticsOrderV1Enum.COMPLETED.getCode());
                     logisticsOrders.add(updateLogisticsOrder);
                     tradeIds.add(x.getTOrderId());
                 }
@@ -3080,7 +3080,7 @@ public class KwtLogisticsConsignmentService {
 
     private void noticeTrader(Long tradeOrderId, List<KwtLogisticsOrder> orders) {
         boolean b = orders.stream()
-                .allMatch(x -> Arrays.asList(LogisticsOrderV1Enum.HAVE_RECONCILED.getCode(), LogisticsOrderV1Enum.REJECT_ORDER.getCode())
+                .allMatch(x -> Arrays.asList(LogisticsOrderV1Enum.COMPLETED.getCode(), LogisticsOrderV1Enum.REJECT_ORDER.getCode())
                         .contains(x.getStatus()));
         if (!b){
             return;

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

@@ -83,7 +83,6 @@ import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -3358,7 +3357,7 @@ public class KwtWaybillOrderV1Service {
         }
         
         waybillOrderResp.setUnloadingTime(DateUtils.format(unloadTrack.getOperateTime(),DateUtils.DATE_TIME_PATTERN));
-        if (Objects.equals(record.getStatus(), CarWaybillV1Enum.WAIT_UNLOADING.getCode())){
+        if (Objects.equals(record.getStatus(), CarWaybillV1Enum.COMPLETED.getCode())){
             waybillOrderResp.setCompleteTime(DateUtils.format(record.getUpdateTime(),DateUtils.DATE_TIME_PATTERN));
         }
 
@@ -3630,7 +3629,7 @@ public class KwtWaybillOrderV1Service {
         updateSubtask.setId(subtask.getId());
         //KwtWaybillOrderTicket kwtWaybillOrderTicket = new KwtWaybillOrderTicket();
         //单证审核 运单当前状态是已卸货，传入的订单是已完成
-        List<Integer> statusList = Arrays.asList(CarWaybillV1Enum.WAIT_UNLOADING.getCode(), CarWaybillV1Enum.COMPLETION_UNLOADING.getCode());
+        List<Integer> statusList = Arrays.asList(CarWaybillV1Enum.COMPLETED.getCode(), CarWaybillV1Enum.REVIEW_REJECTION.getCode());
         if (statusList.contains( status) && Objects.equals(billOrder.getStatus(), CarWaybillV1Enum.COMPLETION_LOADING.getCode())){
             updateOrder.setStatus( status);
             updateOrder.setRemark(req.getRemark());
@@ -3657,7 +3656,7 @@ public class KwtWaybillOrderV1Service {
 
             // 存储记录
             String remark = null;
-            if (Objects.equals(status, CarWaybillV1Enum.COMPLETION_UNLOADING.getCode())){
+            if (Objects.equals(status, CarWaybillV1Enum.REVIEW_REJECTION.getCode())){
                  remark = "审核驳回，运单【"+ billOrder.getWOrderNo() + "】已驳回";
             }else {
                  remark = "审核通过，运单【"+ billOrder.getWOrderNo() + "】已完成";
@@ -3671,8 +3670,8 @@ public class KwtWaybillOrderV1Service {
             return Boolean.TRUE;
         }
         // 驳回的订单可以通过完善单证变成已完成
-        if (Objects.equals(billOrder.getStatus(), CarWaybillV1Enum.COMPLETION_UNLOADING.getCode()) && Objects.equals(status,
-                CarWaybillV1Enum.WAIT_UNLOADING.getCode())){
+        if (Objects.equals(billOrder.getStatus(), CarWaybillV1Enum.REVIEW_REJECTION.getCode()) && Objects.equals(status,
+                CarWaybillV1Enum.COMPLETED.getCode())){
             updateOrder.setStatus(status);
             updateOrder.setRemark(req.getRemark());
             updateSubtask.setStatus(status);
@@ -3741,7 +3740,7 @@ public class KwtWaybillOrderV1Service {
         checkRefuseScore(billOrder, status, driverRulesVO);
 
         //运单没通过，不执行以下逻辑
-        if (!Objects.equals(status, CarWaybillV1Enum.WAIT_UNLOADING.getCode())) {
+        if (!Objects.equals(status, CarWaybillV1Enum.COMPLETED.getCode())) {
             return;
         }
 
@@ -3762,7 +3761,7 @@ public class KwtWaybillOrderV1Service {
      */
     private void checkRefuseScore(KwtWaybillOrder waybillOrder, Integer status, DriverConductRulesVO driverRulesVO) {
         //运单驳回
-        if (!Objects.equals(status, CarWaybillV1Enum.COMPLETION_UNLOADING.getCode())) {
+        if (!Objects.equals(status, CarWaybillV1Enum.REVIEW_REJECTION.getCode())) {
             return;
         }
         //单据错误驳回分数
@@ -3845,7 +3844,7 @@ public class KwtWaybillOrderV1Service {
         }
         Date takingOrderTime = takingOrderNodes.getCreateTime() != null ? takingOrderNodes.getCreateTime() : null;
         //司机完成运单时间
-        KwtWaybillOrderNode overOrderNodes = kwtWaybillOrderNodeRepository.queryNodesByOrderId(waybillOrder.getId(), CarWaybillV1Enum.WAIT_UNLOADING.getCode());
+        KwtWaybillOrderNode overOrderNodes = kwtWaybillOrderNodeRepository.queryNodesByOrderId(waybillOrder.getId(), CarWaybillV1Enum.COMPLETED.getCode());
         if (overOrderNodes == null) {
             throw new BusinessPlatfromException(ErrorCodeEnum.WAYBILL_NODE_NOT_EXIST, "未找到关联的运单节点数据！");
         }
@@ -3928,7 +3927,7 @@ public class KwtWaybillOrderV1Service {
         }
 
         //查询该司机连续审核通过节点数据
-        List<KwtWaybillOrderNode> waybillOrderNodeList = getWaybillOrderNodesByStatus(waybillOrder, continuousOnTimes, CarWaybillV1Enum.WAIT_UNLOADING);
+        List<KwtWaybillOrderNode> waybillOrderNodeList = getWaybillOrderNodesByStatus(waybillOrder, continuousOnTimes, CarWaybillV1Enum.COMPLETED);
         if (waybillOrderNodeList == null)  {
             return;
         }
@@ -3988,7 +3987,7 @@ public class KwtWaybillOrderV1Service {
         }
 
         //查询该司机连续审核通过节点数据
-        List<KwtWaybillOrderNode> waybillOrderNodeList = getWaybillOrderNodesByStatus(waybillOrder, continuousUnloadTimes, CarWaybillV1Enum.WAIT_UNLOADING);
+        List<KwtWaybillOrderNode> waybillOrderNodeList = getWaybillOrderNodesByStatus(waybillOrder, continuousUnloadTimes, CarWaybillV1Enum.COMPLETED);
         if (waybillOrderNodeList == null)  {
             return;
         }
@@ -4106,7 +4105,7 @@ public class KwtWaybillOrderV1Service {
 
     private void noticeTraderOrder(KwtLogisticsOrder kwtLogisticsOrder, KwtLogisticsOrder kwtLogistics) {
 
-        if (!Objects.equals(kwtLogisticsOrder.getStatus(),LogisticsOrderV1Enum.HAVE_RECONCILED.getCode())){
+        if (!Objects.equals(kwtLogisticsOrder.getStatus(),LogisticsOrderV1Enum.COMPLETED.getCode())){
            return;
         }
         // 根据贸易订单id查询物理订单
@@ -4116,7 +4115,7 @@ public class KwtWaybillOrderV1Service {
         }
         //判断所有的物流订单都都已经完成
         boolean b = kwtLogisticsOrders.stream()
-                .allMatch(x -> Arrays.asList(LogisticsOrderV1Enum.HAVE_RECONCILED.getCode(), LogisticsOrderV1Enum.REJECT_ORDER.getCode()).contains(x.getStatus()));
+                .allMatch(x -> Arrays.asList(LogisticsOrderV1Enum.COMPLETED.getCode(), LogisticsOrderV1Enum.REJECT_ORDER.getCode()).contains(x.getStatus()));
         if (!b){
             return;
         }
@@ -4315,7 +4314,7 @@ public class KwtWaybillOrderV1Service {
     @NotNull
     private static List<WaybillOrderNodeVo.WaybillOrderNode> getWaybillOrderNodes(List<WaybillOrderNodeVo.Timeline> voList) {
         Map<Integer, List<WaybillOrderNodeVo.Timeline>> statusAndTimelineMap = voList.stream()
-                .filter(t ->!Arrays.asList(CarWaybillV1Enum.WEIGHT_TRAFFIC.getCode(),CarWaybillV1Enum.WAIT_UNLOADING.getCode(),CarWaybillV1Enum.APPROVAL_TREAT.getCode(), CarWaybillV1Enum.COMPLETION_UNLOADING.getCode()).contains(t.getOrderStatus()))
+                .filter(t ->!Arrays.asList(CarWaybillV1Enum.WEIGHT_TRAFFIC.getCode(),CarWaybillV1Enum.COMPLETED.getCode(),CarWaybillV1Enum.CANCELLED.getCode(), CarWaybillV1Enum.REVIEW_REJECTION.getCode()).contains(t.getOrderStatus()))
                 .sorted(Comparator.comparing(WaybillOrderNodeVo.Timeline::getCreateTime))
                 .collect(Collectors.groupingBy(WaybillOrderNodeVo.Timeline::getOrderStatus));
         List<WaybillOrderNodeVo.WaybillOrderNode> nodeList = Lists.newArrayList();

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

@@ -119,7 +119,7 @@ public class WaybillOrderService {
             CarWaybillV1Enum.REFUSE_TRAFFIC.getCode(),
             CarWaybillV1Enum.EXIT_COMPLETED.getCode(),
             CarWaybillV1Enum.WAIT_LOADING.getCode(),
-            CarWaybillV1Enum.COMPLETION_UNLOADING.getCode()
+            CarWaybillV1Enum.REVIEW_REJECTION.getCode()
     );
 
     // 定义进行中的状态集合
@@ -133,12 +133,12 @@ public class WaybillOrderService {
     // 定义审核的状态集合
     private static final List<Integer> REVIEW = Arrays.asList(
             CarWaybillV1Enum.COMPLETION_LOADING.getCode(),
-            CarWaybillV1Enum.COMPLETION_UNLOADING.getCode());
+            CarWaybillV1Enum.REVIEW_REJECTION.getCode());
 
     // 定义已完成的状态集合
     private static final List<Integer> COMPLETED = Arrays.asList(
-            CarWaybillV1Enum.WAIT_UNLOADING.getCode(),
-            CarWaybillV1Enum.APPROVAL_TREAT.getCode());
+            CarWaybillV1Enum.COMPLETED.getCode(),
+            CarWaybillV1Enum.CANCELLED.getCode());
 
 
 
@@ -154,7 +154,7 @@ public class WaybillOrderService {
                 .eq(KwtWaybillOrder::getEntId, param.getEntId())
                 .eq(KwtWaybillOrder::getDriverId, param.getDriverId())
                 .eq(KwtWaybillOrder::getDelFlag,0)
-                .eq(KwtWaybillOrder::getStatus,CarWaybillV1Enum.WAIT_UNLOADING.getCode())
+                .eq(KwtWaybillOrder::getStatus,CarWaybillV1Enum.COMPLETED.getCode())
                 .orderByDesc(KwtWaybillOrder::getCreateTime)
                 .orderByDesc(KwtWaybillOrder::getId);
         //1. 查询司机的完成运单
@@ -793,11 +793,11 @@ public class WaybillOrderService {
             wbOrderResp.setStatusDesc("进行中");
         } else if (Objects.equals(wbOrder.getStatus(), CarWaybillV1Enum.COMPLETION_LOADING.getCode())) {
             wbOrderResp.setStatusDesc("待审核");
-        } else if (Objects.equals(wbOrder.getStatus(), CarWaybillV1Enum.WAIT_UNLOADING.getCode())) {
+        } else if (Objects.equals(wbOrder.getStatus(), CarWaybillV1Enum.COMPLETED.getCode())) {
             wbOrderResp.setStatusDesc("已完成");
-        } else if (Objects.equals(wbOrder.getStatus(), CarWaybillV1Enum.COMPLETION_UNLOADING.getCode())) {
+        } else if (Objects.equals(wbOrder.getStatus(), CarWaybillV1Enum.REVIEW_REJECTION.getCode())) {
             wbOrderResp.setStatusDesc("待修改");
-        } else if (Objects.equals(wbOrder.getStatus(), CarWaybillV1Enum.APPROVAL_TREAT.getCode())) {
+        } else if (Objects.equals(wbOrder.getStatus(), CarWaybillV1Enum.CANCELLED.getCode())) {
             wbOrderResp.setStatusDesc("已取消");
         } else {
             wbOrderResp.setStatusDesc("未知状态");

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

@@ -1,7 +1,6 @@
 package com.sckw.transport.service;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -11,12 +10,10 @@ import com.google.common.collect.Sets;
 import com.sckw.contract.api.RemoteContractService;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.BusinessException;
-import com.sckw.core.model.constant.UrlConstants;
 import com.sckw.core.model.enums.AddressTypeEnum;
 import com.sckw.core.model.enums.CarWaybillEnum;
 import com.sckw.core.model.enums.CarWaybillV1Enum;
 import com.sckw.core.utils.DateUtils;
-import com.sckw.core.utils.HttpUtil;
 import com.sckw.core.web.constant.CommonConstants;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.BaseIotResult;
@@ -42,7 +39,6 @@ import com.sckw.transport.model.dto.TruckDto;
 import com.sckw.transport.api.feign.VehicleTraceClient;
 import com.sckw.transport.api.model.dto.VehicleDataDTO;
 import com.sckw.transport.api.model.dto.VehicleReturnData;
-import com.sckw.transport.model.enuma.ExceptionSortTypeEnum;
 import com.sckw.transport.model.enuma.VehicleExceptionTypeEnum;
 import com.sckw.transport.model.param.*;
 import com.sckw.transport.model.dto.GenerateTraceReq;
@@ -282,7 +278,7 @@ public class kwfTruckTraceService {
         kwfTruckTraceReplay.setPhone(waybillOrder.getDriverPhone());
         kwfTruckTraceReplay.setTruckNo(waybillOrder.getTruckNo());
         //已完成的状态
-        List<Integer> complatedStatusList = Arrays.asList(CarWaybillV1Enum.WAIT_UNLOADING.getCode(), CarWaybillV1Enum.APPROVAL_TREAT.getCode());
+        List<Integer> complatedStatusList = Arrays.asList(CarWaybillV1Enum.COMPLETED.getCode(), CarWaybillV1Enum.CANCELLED.getCode());
         if (complatedStatusList.contains(waybillOrder.getStatus())){
             kwfTruckTraceReplay.setStatus("1");
             kwfTruckTraceReplay.setStatusDesc("已结束");
@@ -330,7 +326,7 @@ public class kwfTruckTraceService {
         kwfTruckTraceReplay.setExceptionCount(exceptionCount);
         // 计算任务耗时（分钟）
         Date endTime = new Date();
-        if (Objects.equals(waybillOrder.getStatus(), CarWaybillV1Enum.WAIT_UNLOADING.getCode())){
+        if (Objects.equals(waybillOrder.getStatus(), CarWaybillV1Enum.COMPLETED.getCode())){
             endTime = waybillOrder.getUpdateTime() != null ? waybillOrder.getUpdateTime() : new Date();
         }
         long duration = (endTime.getTime() - startTime.getTime()) / (1000 * 60);
@@ -1384,7 +1380,7 @@ public class kwfTruckTraceService {
         // 计算任务耗时（分钟）
         Date startTime =  order.getCreateTime();
         Date endTime = new Date();
-        if (Objects.equals(order.getStatus(), CarWaybillV1Enum.WAIT_UNLOADING.getCode())){
+        if (Objects.equals(order.getStatus(), CarWaybillV1Enum.COMPLETED.getCode())){
             endTime = order.getUpdateTime() != null ? order.getUpdateTime() : new Date();
         }
         long duration = (endTime.getTime() - startTime.getTime()) / (1000 * 60);