Merge branch 'feature/20200109_微信订阅消息' into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md

assortment-ordercenter-sdk/readme.md

@@ -12,3 +12,6 @@
 | 1.1.1-SNAPSHOT | 创建订单新增部分参数 | 侯书虎   | 2019-12-27 |
 | 1.1.2-SNAPSHOT | 创建订单新增部分参数 | 侯书虎   | 2020-01-03 |
 | 1.1.3-SNAPSHOT | 围餐商品删除 | 丁凯    | 2020-01-07 |
+
+| 1.1.1.RELEASE| 1.9.9sessionKey  | 胡超 | 20200108  |
+| 1.1.2.RELEASE| 1.9.9需求打包release版本  | 丁凯 | 20200108  |
\ No newline at end of file

order-application-service/pom.xml

@@ -65,7 +65,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-messagepush-sdk</artifactId>
-            <version>2.5.1-SNAPSHOT</version>
+            <version>2.5.2.RELEASE</version>
             <exclusions>
                 <exclusion>
                     <groupId>cn.freemud.commons</groupId>

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -86,7 +86,7 @@ import com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto;
 import com.freemud.application.sdk.api.structure.service.MessageCenterClient;
 import com.freemud.sdk.api.assortment.message.config.MessageOfficialRefundPushMqConfig;
 import com.freemud.sdk.api.assortment.message.entity.MpTemplateMsg;
-import com.freemud.sdk.api.assortment.message.entity.TemplateKeyword;
+import com.freemud.sdk.api.assortment.message.entity.MpTemplateMsgDataValue;
 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;
@@ -2105,20 +2105,20 @@ public class OrderServiceImpl implements Orderservice {
         String orderId = orderBean.getOid();
         MpTemplateMsg template = new MpTemplateMsg();
         MpTemplateMsg.TemplateMsgData data = new MpTemplateMsg.TemplateMsgData();
-        TemplateKeyword first = new TemplateKeyword();
+        MpTemplateMsgDataValue first = new MpTemplateMsgDataValue();
         first.setValue("用户申请退款");
-        TemplateKeyword keyword1 = new TemplateKeyword();
+        MpTemplateMsgDataValue keyword1 = new MpTemplateMsgDataValue();
         keyword1.setValue(orderId);
-        TemplateKeyword keyword2 = new TemplateKeyword();
+        MpTemplateMsgDataValue keyword2 = new MpTemplateMsgDataValue();
         Double amount = orderBean.getAmount() / 100.0D;
         keyword2.setValue(amount.toString()+ " 元");
-        TemplateKeyword keyword3 = new TemplateKeyword();
+        MpTemplateMsgDataValue keyword3 = new MpTemplateMsgDataValue();
         keyword3.setValue(orderBean.getGmtPay() == null ? "" : DateUtil.convert2String(new Date(orderBean.getGmtPay()), "yyyy-MM-dd HH:mm:ss"));
-        TemplateKeyword keyword4 = new TemplateKeyword();
+        MpTemplateMsgDataValue keyword4 = new MpTemplateMsgDataValue();
         keyword4.setValue(orderBean.getUserName());
-        TemplateKeyword keyword5 = new TemplateKeyword();
+        MpTemplateMsgDataValue keyword5 = new MpTemplateMsgDataValue();
         keyword5.setValue(orderBean.getPhone());
-        TemplateKeyword remark = new TemplateKeyword();
+        MpTemplateMsgDataValue remark = new MpTemplateMsgDataValue();
         remark.setValue(request.getReason()+","+request.getRemark());
         data.setFirst(first);
         data.setKeyword1(keyword1);

ordercenter-sdk/readme.md

-#### 订单SDK说明
+#### 老订单SDK说明
 
 | 版本号       | 版本说明         | 更新人 | 更新时间   |
 | ------------ | ---------------- | ------ | ---------- |
@@ -7,4 +7,5 @@
 | 1.0.3-SNAPSHOT | 订单日结售后单 | 胡超   | 2019-12-25 |
 | 1.1.0.RELEASE| 1.9.8需求打包release版本  | 侯书虎 | 2019-12-26  |
 | 1.1.1-SNAPSHOT | 创建订单新增部分参数 | 侯书虎   | 2019-12-27 |
-| 1.1.2-SNAPSHOT | 创建订单新增部分参数 | 侯书虎   | 2020-01-03 |
+| 1.1.2-SNAPSHOT | 创建订单新增部分参数 | 侯书虎   | 2020-01-03 |
\ No newline at end of file
+| 1.1.1.RELEASE| 1.9.9需求打包release版本  | 丁凯 | 2020-01-08  |
\ No newline at end of file