接单优化

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

@@ -92,9 +92,7 @@ public abstract class AbstractWaybillOrderHandler<T extends WaybillOrderProcessP
             // 6. 生成节点轨迹
             createNodeTrace(param, waybillOrder);
             //7.自动派单计算分值
-            if(DispatchWayEnums.AUTO_DISPATCH.getCode().equals(waybillOrder.getDispatchWay())) {
-                calculateAutoDispatchScore(param, waybillOrder);
-            }
+            calculateScore(param, waybillOrder);
             // 8. 后置处理
             OrderTakingResp handlerResult = afterProcess(param, waybillOrder);
 
@@ -185,6 +183,18 @@ public abstract class AbstractWaybillOrderHandler<T extends WaybillOrderProcessP
         return node;
     }
 
+    /**
+     * 计算自动派车的行为分数
+     * @param param
+     * @param waybillOrder
+     */
+    protected void calculateScore(T param, KwtWaybillOrder waybillOrder) {
+        if (!(param instanceof OrderCirculateTakingQueryParam) && DispatchWayEnums.AUTO_DISPATCH.getCode().equals(waybillOrder.getDispatchWay())) {
+            calculateAutoDispatchScore(param, waybillOrder);
+        }
+
+    }
+
     // //7.自动派单计算分值
     protected abstract void calculateAutoDispatchScore(T param, KwtWaybillOrder waybillOrder);
 

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

@@ -565,8 +565,11 @@ public class TakingOrderHandler extends AbstractWaybillOrderHandler<OrderCircula
 
     // 7. 绑定车辆
     private void driverBindTruck(KwtWaybillOrder waybillOrder) {
-        remoteFleetService.driverBindTruck(waybillOrder.getDriverId(), waybillOrder.getTruckId(), waybillOrder.getEntId());
-
+        try {
+            remoteFleetService.driverBindTruck(waybillOrder.getDriverId(), waybillOrder.getTruckId(), waybillOrder.getEntId());
+        } catch (Exception e) {
+            log.error("接单绑定车辆失败，此车辆已与此司机绑定!", e);
+        }
     }