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

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.0.9-SNAPSHOT</version>
+    <version>1.1.2.RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.1.0.RELEASE</version>
+            <version>1.1.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

assortment-ordercenter-sdk/readme.md

@@ -4,3 +4,5 @@
 | 1.0.0-SNAPSHOT | 迁移后包明改为cn.freemud开头第一版 | wuping | 2019-12-16 |
 | 6.4.10.RELEASE| 骑手小费  | 张明警 | 2019-12-26  |
 | 1.1.0.RELEASE| 1.9.8需求打包release版本  | 侯书虎 | 2019-12-26  |
+| 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

@@ -35,7 +35,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.1.2.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
@@ -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>
@@ -109,7 +109,7 @@
         <dependency>
             <artifactId>assortment-data-manager</artifactId>
             <groupId>com.freemud.sdk.api.assortment</groupId>
-            <version>3.5.RELEASE</version>
+            <version>3.9.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud.commons</groupId>

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

@@ -85,7 +85,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;
@@ -2085,20 +2085,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/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.1.0.RELEASE</version>
+    <version>1.1.1.RELEASE</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/readme.md

@@ -4,3 +4,4 @@
 | ------------ | ---------------- | ------ | ---------- |
 | 1.0.0-SNAPSHOT | 迁移后包明改为cn.freemud开头第一版 | wuping | 2019-12-16 |
 | 1.1.0.RELEASE| 1.9.8需求打包release版本  | 侯书虎 | 2019-12-26  |
+| 1.1.1.RELEASE| 1.9.9需求打包release版本  | 丁凯 | 2020-01-08  |
\ No newline at end of file