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

sckw-common/sckw-common-stream/src/main/java/com/sckw/stream/enums/MessageEnum.java

@@ -19,28 +19,44 @@ public enum MessageEnum {
     /**
      * 有新的待受理订单
      */
-    ORDER_NEW_PENDING("BUSINESS", "BUSINESS_TORDER_NEW_PENDING", "有新的待受理订单",
+    ORDER_NEW_PENDING("BUSINESS", "BUSINESS_ORDER_NEW_PENDING", "有新的待受理订单",
                                    "【${firmName}】发起采购申请，请及时进行受理；订单号：${orderNo}","terminal,ios,android"),
     /**
      * 发起代客下单
      */
-    ORDER_INITIATE_SALE("BUSINESS", "BUSINESS_TORDER_INITIATE_SALE", "发起代客下单",
+    ORDER_INITIATE_SALE("BUSINESS", "BUSINESS_ORDER_INITIATE_SALE", "发起代客下单",
                            "贵司已代【${firmName}】发起了商品采购，请及时联系往来单位；订单号：${orderNo}","terminal,ios,android"),
     /**
      * 有新的代客下单信息
      */
-    ORDER_NEW_VALET_MSG("BUSINESS", "BUSINESS_TORDER_NEW_VALET_MSG", "有新的代客下单信息",
+    ORDER_NEW_VALET_MSG("BUSINESS", "BUSINESS_ORDER_NEW_VALET_MSG", "有新的代客下单信息",
             "【${firmName}】代您发起了商品采购，请确认；订单号：${orderNo}","terminal,ios,android"),
     /**
      * 驳回采购订单
      */
-    ORDER_REJECT_VALET("BUSINESS", "BUSINESS_TORDER_REJECT_VALET", "驳回采购订单",
+    ORDER_REJECT_VALET("BUSINESS", "BUSINESS_ORDER_REJECT_VALET", "驳回采购订单",
             "贵司驳回了【${firmName}】的采购申请，请及时通知采购单位；订单号：${orderNo}","terminal,ios,android"),
     /**
      * 采购订单被驳回
      */
-    ORDER_REJECT_PURCHASE("BUSINESS", "BUSINESS_TORDER_REJECT_PURCHASE", "采购订单被驳回",
+    ORDER_REJECT_PURCHASE("BUSINESS", "BUSINESS_ORDER_REJECT_PURCHASE", "采购订单被驳回",
             "您的采购申请被【${firmName}】驳回，请及时查看；订单号：${orderNo}","terminal,ios,android"),
+    /**
+     * 司机拒绝接单
+     */
+    WAYBILL_REFUSE_SENDCAR_TRIP("BUSINESS", "BUSINESS_WAYBILL_REFUSE_SENDCAR_TRIP", "司机拒绝接单",
+            "贵司指派的运单被拒绝接单了，请及时确认；运单号：${orderNo},司机：${driverName}","terminal,ios,android"),
+    /**
+     * 司机拒绝接单
+     */
+    WAYBILL_REFUSE_SENDCAR_CIRCULATE("BUSINESS", "BUSINESS_WAYBILL_REFUSE_SENDCAR_CIRCULATE", "司机拒绝接单",
+            "贵司指派的运单被拒绝接单了，请及时确认；承运单号：${orderNo},司机：${driverName}","terminal,ios,android"),
+
+    /**
+     * 司机拒绝出车
+     */
+    WAYBIL_CONFIRM_DEPARTURE("BUSINESS", "BUSINESS_WAYBIL_CONFIRM_DEPARTURE", "司机拒绝出车",
+            "贵司的运单被拒绝出车了，请及时确认；运单号：${orderNo},司机：${driverName}","terminal,ios,android"),
     ;
 
     /**

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

@@ -1,8 +1,10 @@
 package com.sckw.transport.service;
 
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.sckw.core.common.enums.NumberConstant;
+import com.sckw.core.common.enums.enums.DictEnum;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.constant.Global;
@@ -22,7 +24,10 @@ import com.sckw.order.api.dubbo.TradeOrderInfoService;
 import com.sckw.order.api.model.CompleteLogisticsOrderParam;
 import com.sckw.redis.constant.RedisConstant;
 import com.sckw.redis.utils.RedissonUtils;
+import com.sckw.stream.enums.MessageEnum;
 import com.sckw.stream.model.SckwBusSum;
+import com.sckw.stream.model.SckwMessage;
+import com.sckw.stream.model.UserInfo;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
@@ -706,6 +711,7 @@ public class KwtWaybillOrderService {
         waybillOrder.setDriverIdcard(circulate.getDriverIdcard());
         waybillOrder.setEntrustAmount(circulate.getEntrustAmount());
         waybillOrder.setStatus(CarWaybillEnum.PENDING_VEHICLE.getCode());
+        waybillOrder.setCreateBy(circulate.getCreateBy());
         return waybillOrder;
     }
 
@@ -1275,7 +1281,16 @@ public class KwtWaybillOrderService {
             editSckwLogisticsOrder(lOrder, logisticsOrder);
 
             /**6发送消息**/
-
+            List<UserInfo> users = new ArrayList<>(){{add(new UserInfo(waybillOrder.getCreateBy(), waybillOrder.getEntId()));}};
+            Map<String, Object> msgParams = new HashMap<>(){{put("orderNo", waybillOrder.getWOrderNo());}};
+            SckwMessage msg = new SckwMessage();
+            msg.setRequestId(UUIDUtils.get32UUID());
+            msg.setMessageEnum(MessageEnum.WAYBILL_REFUSE_SENDCAR_TRIP);
+            msg.setParams(msgParams);
+            msg.setMsgUrl(null);
+            msg.setUserInfos(users);
+            msg.setCreateBy(LoginUserHolder.getUserId());
+            streamBridge.send("sckw-message", JSON.toJSONString(msg));
         }
 
         /**循环派车**/
@@ -1303,8 +1318,18 @@ public class KwtWaybillOrderService {
             editSckwWaybillOrder(wOrder, waybillOrder, 2);
 
             /**4发送消息**/
+            KwtLogisticsOrder logisticsOrder = logisticsOrderDao.selectById(circulate.getLOrderId());
+            List<UserInfo> users = new ArrayList<>(){{add(new UserInfo(circulate.getCreateBy(), circulate.getEntId()));}};
+            Map<String, Object> msgParams = new HashMap<>(){{put("orderNo", logisticsOrder.getLOrderNo());}};
+            SckwMessage msg = new SckwMessage();
+            msg.setRequestId(UUIDUtils.get32UUID());
+            msg.setMessageEnum(MessageEnum.WAYBILL_REFUSE_SENDCAR_CIRCULATE);
+            msg.setParams(msgParams);
+            msg.setMsgUrl(null);
+            msg.setUserInfos(users);
+            msg.setCreateBy(LoginUserHolder.getUserId());
+            streamBridge.send("sckw-message", JSON.toJSONString(msg));
         }
-
         return HttpResult.ok("拒绝接单成功!");
     }
 
@@ -1396,6 +1421,16 @@ public class KwtWaybillOrderService {
         editSckwLogisticsOrder(lOrder, logisticsOrder);
 
         /**7发送消息**/
+        List<UserInfo> users = new ArrayList<>(){{add(new UserInfo(waybillOrder.getCreateBy(), waybillOrder.getEntId()));}};
+        Map<String, Object> msgParams = new HashMap<>(){{put("orderNo", waybillOrder.getWOrderNo());}};
+        SckwMessage msg = new SckwMessage();
+        msg.setRequestId(UUIDUtils.get32UUID());
+        msg.setMessageEnum(MessageEnum.ORDER_REJECT_PURCHASE);
+        msg.setParams(msgParams);
+        msg.setMsgUrl(null);
+        msg.setUserInfos(users);
+        msg.setCreateBy(LoginUserHolder.getUserId());
+        streamBridge.send("sckw-message", JSON.toJSONString(msg));
 
         return HttpResult.ok("拒绝出车成功！");
     }