Merge branch 'feature/20200518_预支付新增点餐类型'

order-application-service/pom.xml

@@ -30,7 +30,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>structure-center-sdk</artifactId>
-            <version>1.2.2.RELEASE</version>
+            <version>1.2.3.RELEASE</version>
         </dependency>
         <dependency>
             <artifactId>couponcenter-sdk</artifactId>

order-management/pom.xml

@@ -64,7 +64,7 @@
         <dependency>
             <artifactId>structure-center-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>1.2.2.RELEASE</version>
+            <version>1.2.3.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

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

@@ -8,12 +8,16 @@ import com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto;
 import com.freemud.sdk.api.assortment.message.enums.MessageEventType;
 import com.freemud.sdk.api.assortment.message.request.MessagePushOrderTemplateRequest;
 import com.freemud.sdk.api.assortment.message.request.MessageTemplateRequest;
+import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
 import org.apache.commons.lang.ObjectUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 @Component
 public class MessagePushAdapter {
+    @Autowired
+    private OrderSdkAdapter orderSdkAdapter;
 
     public PushMessageNoticeDto convent2PushMessageNoticeDto(Integer targetType, String partnerId,
                                                              String storeId, String userId, String oid, Integer deliveryStatus, Integer cmdType) {
@@ -54,7 +58,7 @@ public class MessagePushAdapter {
         if (extInfo != null) {
             content.setFromAppId(extInfo.getFromAppId());
         }
-        //content.setDeliveryStatus(deliveryStatus);
+        content.setOrderClient(orderSdkAdapter.getNewOrderClient(order.getSource()));
         content.setPickUpGoodsNo(order.getOtherCode());
         content.setUserId(order.getUserId());
         content.setOrderState(order.getStatus());