donglang 16 цаг өмнө
parent
commit
ee9e83dc75

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

@@ -4553,6 +4553,9 @@ public class KwtWaybillOrderV1Service {
                 }
             }
 
+            //计算司机分值
+            calculateAutoDispatchScore(billOrder, status);
+
             return Boolean.TRUE;
         }
         // 驳回的订单可以通过完善单证变成已完成
@@ -4593,8 +4596,6 @@ public class KwtWaybillOrderV1Service {
             return Boolean.TRUE;
         }
         noticeTraderOrder(status, subtask,kwtLogistics);
-        //计算司机分值
-        calculateAutoDispatchScore(billOrder, status);
 
         return Boolean.FALSE;
     }
@@ -4631,10 +4632,9 @@ public class KwtWaybillOrderV1Service {
      * @param billOrder
      */
     protected void calculateAutoDispatchScore(KwtWaybillOrder billOrder, Integer status) {
-//        if (true) {
-//            //先不执行自动派单逻辑
-//            return;
-//        }
+        if (!DispatchWayEnums.AUTO_DISPATCH.getCode().equals(billOrder.getDispatchWay())) {
+            return;
+        }
         //查询物流订单
         KwtLogisticsOrder logisticsOrder = kwtLogisticsOrderRepository.queryByLogisticsOrderId(billOrder.getLOrderId());