消息中心通知状态问题修复

order-management/src/main/java/cn/freemud/management/adapter/MessagePushAdapter.java

@@ -2,6 +2,7 @@ package cn.freemud.management.adapter;
 
 import cn.freemud.management.enums.MessageCenterCmdType;
 import cn.freemud.management.enums.OperateType;
+import cn.freemud.management.enums.OrderStatus;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto;
@@ -41,7 +42,7 @@ public class MessagePushAdapter {
         return pushMessageNoticeDto;
     }
 
-    public PushMessageNoticeDto convent2PushMessageNoticeDto1(QueryOrdersResponse.DataBean.OrderBean order) {
+    public PushMessageNoticeDto convent2PushMessageNoticeDto1(QueryOrdersResponse.DataBean.OrderBean order, OperateType opType) {
         PushMessageNoticeDto pushMessageNoticeDto = new PushMessageNoticeDto();
         pushMessageNoticeDto.setPartnerId(order.getCompanyId());
         pushMessageNoticeDto.setStoreId(order.getShopId());
@@ -61,7 +62,30 @@ public class MessagePushAdapter {
         content.setOrderClient(orderSdkAdapter.getNewOrderClient(order.getSource()));
         content.setPickUpGoodsNo(order.getOtherCode());
         content.setUserId(order.getUserId());
-        content.setOrderState(order.getStatus());
+        Integer orderStatus = order.getStatus();
+        switch (opType) {
+            case ORDER_CONFIRM:
+                orderStatus= OrderStatus.RECEIPT.getCode();
+                break;
+            case ORDER_DONE:
+                orderStatus=OrderStatus.COMPLETE_MAKE.getCode();
+                break;
+            case ORDER_SEND:
+                orderStatus=OrderStatus.DISTRIBUTION.getCode();
+                break;
+            case ORDER_AFFIRM:
+                orderStatus=OrderStatus.COMPLETE.getCode();
+                break;
+            case ORDER_REJECT:
+            case ORDER_AGREE_REFUND:
+                orderStatus=OrderStatus.CANCEL.getCode();
+                break;
+            case ORDER_REJECT_REFUND:
+                break;
+            default:
+        }
+
+        content.setOrderState(orderStatus);
         message.setContent(content);
         pushMessageNoticeDto.setData(JSONObject.toJSONString(message));
         return pushMessageNoticeDto;

order-management/src/main/java/cn/freemud/management/service/OrderBaseService.java

@@ -57,7 +57,7 @@ public class OrderBaseService {
         //发送消息到pos消息中心
         PushMessageNoticeDto pushMessageNoticeDto1 = null;
         try {
-            pushMessageNoticeDto1 = messagePushAdapter.convent2PushMessageNoticeDto1(orderBean);
+            pushMessageNoticeDto1 = messagePushAdapter.convent2PushMessageNoticeDto1(orderBean, opType);
             messageCenterClient.createMessage(pushMessageNoticeDto1, LogThreadLocal.getTrackingNo());
         } catch (Exception e) {
             ErrorLog.printErrorLog("sendMessageCenterError", "", pushMessageNoticeDto1, e);