Merge branch 'feature/订单推送改造'

call-back-service/pom.xml

@@ -62,7 +62,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-orderdistributor-sdk</artifactId>
-            <version>3.5.8.RELEASE</version>
+            <version>3.6.0.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
@@ -70,11 +70,6 @@
             <version>5.5.42-RELEASE</version>
         </dependency>
         <dependency>
-            <groupId>com.freemud.sdk.api.assortment</groupId>
-            <artifactId>assortment-dynamic-queue</artifactId>
-            <version>1.7.RELEASE</version>
-        </dependency>
-        <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
         </dependency>

call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java

@@ -22,18 +22,18 @@ import cn.freemud.entities.dto.OrderExtInfoDto;
 import cn.freemud.entities.dto.OrderStatusChangeRequestDto;
 import cn.freemud.entities.dto.UserLoginInfoDto;
 import cn.freemud.entities.dto.WechatReportOrderDto;
-import com.freemud.application.sdk.api.ordercenter.entities.vo.OrderCallBackRequestVo;
 import cn.freemud.redis.RedisCache;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformWxapp;
 import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformWxappManager;
 import com.freemud.application.sdk.api.log.ApiLog;
+import com.freemud.application.sdk.api.ordercenter.entities.vo.OrderCallBackRequestVo;
 import com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
-import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderPayItemResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderItemResp;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderPayItemResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp;
 import com.freemud.application.sdk.api.ordercenter.util.LogUtil;
 import com.freemud.sdk.api.assortment.orderdistributor.request.DisRequest;
@@ -66,6 +66,7 @@ public class OrderCallBackMQService {
     private static final String backOrdersNotifyActivityExchange="program.backorders_notify_activity_exchange";
     @Autowired
     private LogUtil logUtil;
+
     public void sendOrderMQ(OrderCallBackRequestVo body) {
         OrderInfoReqs orderInfoReqs = getOrderInfoReqs(body);
         if (orderInfoReqs == null) {
@@ -156,6 +157,7 @@ public class OrderCallBackMQService {
         disRequest.setExtJson(orderBean.getContent());
         disRequest.setStatus(orderState.toString());
         disRequest.setPartnerId(orderBean.getPartnerId());
+        disRequest.setStoreCode(orderBean.getStoreId());
         disRequest.setOrderCode(orderBean.getOrderCode());
         disRequest.setVer("2");
         disRequest.setOperateType(orderBean.getOperateType().toString());