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

order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java

@@ -108,6 +108,9 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
     @Autowired
     private StoreCenterService storeCenterService;
 
+    private final String deliveryEarlyWarningMsg = "运单预警";
+
+
     @Override
     public BaseResponse callbackUrl(CallbackUrlRequestDto request) {
         // 获取回调状态
@@ -336,7 +339,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
         // pos获取回调状态
         sendPosMessage(request.getPartnerId(), request.getStoreId(), request.getOrderId(), 71, request.getErrorDesc());
         //生态回调
-        sendException(request.getOrderId(),  request.getErrorDesc(),  request.getErrorCreateTime(),  "运单预警");
+        sendException(request.getOrderId(),  request.getErrorDesc(),  request.getErrorCreateTime(),  deliveryEarlyWarningMsg);
         return ResponseUtil.success();
     }
 
@@ -563,9 +566,16 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
             SubscribeMessageRequest request = new SubscribeMessageRequest();
             OrderExtInfoDto extInfoDto = JSONObject.parseObject(orderBean.getExtInfo(), new TypeReference<OrderExtInfoDto>() {
             });
+            String messageType = "UNUSUAL_ORDER";
+            if(deliveryEarlyWarningMsg.equals(desc)){
+                messageType = "DELIVERY_REMIND";
+                if(orderBean.getStatus() != null && OrderStatus.getByCode(orderBean.getStatus()) != null){
+                    desc = OrderStatus.getByCode(orderBean.getStatus()).getDesc();
+                }
+            }
             request.setMiniAppId(extInfoDto.getAppid());
             SendMessageRequest sendMessageRequest = new SendMessageRequest();
-            sendMessageRequest.setMessageType("UNUSUAL_ORDER");
+            sendMessageRequest.setMessageType(messageType);
             sendMessageRequest.setMiniAppId(extInfoDto.getAppid());
             sendMessageRequest.setOrderId(orderId);
             sendMessageRequest.setPartnerId(orderBean.getCompanyId());