Bläddra i källkod

1、拒绝出车业务消息跳转地址调整;
2、趟次停止接单车辆任务完成数统计调整;

zk 2 år sedan
förälder
incheckning
f2e74ae710

+ 17 - 3
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderService.java

@@ -44,6 +44,7 @@ import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.stream.function.StreamBridge;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -95,6 +96,10 @@ public class KwtWaybillOrderService {
     private RemoteFleetService remoteFleetService;
     @DubboReference(version = "1.0.0", group = "design", check = false)
     private TradeOrderInfoService tradeOrderInfoService;
+    @Value("${message.waybill.refuseSendCar.app}")
+    private String refuseSendCarAppUrl;
+    @Value("${message.waybill.refuseSendCar.pc}")
+    private String refuseSendCarPcUrl;
 
     /**
      * @param driverId 司机ID
@@ -1365,7 +1370,10 @@ public class KwtWaybillOrderService {
             msg.setRequestId(UUIDUtils.get32UUID());
             msg.setMessageEnum(MessageEnum.WAYBILL_REFUSE_SENDCAR_TRIP);
             msg.setParams(msgParams);
-            msg.setMsgUrl(null);
+            msg.setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
+                put("app", refuseSendCarAppUrl);
+                put("pc", refuseSendCarPcUrl);
+            }});
             msg.setUserInfos(users);
             msg.setCreateBy(LoginUserHolder.getUserId());
             streamBridge.send("sckw-message", JSON.toJSONString(msg));
@@ -1408,7 +1416,10 @@ public class KwtWaybillOrderService {
             msg.setRequestId(UUIDUtils.get32UUID());
             msg.setMessageEnum(MessageEnum.WAYBILL_REFUSE_SENDCAR_CIRCULATE);
             msg.setParams(msgParams);
-            msg.setMsgUrl(null);
+            msg.setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
+                put("app", refuseSendCarAppUrl);
+                put("pc", refuseSendCarPcUrl);
+            }});
             msg.setUserInfos(users);
             msg.setCreateBy(LoginUserHolder.getUserId());
             streamBridge.send("sckw-message", JSON.toJSONString(msg));
@@ -1531,7 +1542,10 @@ public class KwtWaybillOrderService {
         msg.setRequestId(UUIDUtils.get32UUID());
         msg.setMessageEnum(MessageEnum.WAYBIL_CONFIRM_DEPARTURE);
         msg.setParams(msgParams);
-        msg.setMsgUrl(null);
+        msg.setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
+            put("app", refuseSendCarAppUrl);
+            put("pc", refuseSendCarPcUrl);
+        }});
         msg.setUserInfos(users);
         msg.setCreateBy(LoginUserHolder.getUserId());
         streamBridge.send("sckw-message", JSON.toJSONString(msg));

+ 2 - 1
sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderMapper.xml

@@ -652,7 +652,8 @@
     </select>
 
     <select id="selectDriverListById" resultType="com.sckw.transport.model.vo.DriverListVo">
-        SELECT COUNT( b.truck_no ) AS count,
+        SELECT
+        count(IF(b.status in (7, 8, 13), 1, NULL)) AS count,
         a.id AS lOrderId,
         a.l_order_no AS lOrderNo,
         b.driver_id AS driverId,