Merge branches 'feature/20200226_支付宝模板消息_wuping' and 'master' of…

Merge branches 'feature/20200226_支付宝模板消息_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	order-application-service/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/entities/OrderExtInfoDTO.java

@@ -19,6 +19,9 @@ public class OrderExtInfoDTO {
 
     private  String prepayId;
 
+    //支付宝小程序订单特定模板消息需要
+    private  String formId;
+
     private String accessToken;
     /**
      * 到期时间

order-application-service/pom.xml

@@ -70,7 +70,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-messagepush-sdk</artifactId>
-            <version>2.5.5.RELEASE</version>
+            <version>2.6.3.RELEASE</version>
             <exclusions>
                 <exclusion>
                     <groupId>cn.freemud.commons</groupId>
@@ -114,7 +114,7 @@
         <dependency>
             <artifactId>assortment-data-manager</artifactId>
             <groupId>com.freemud.sdk.api.assortment</groupId>
-            <version>4.1.3-SNAPSHOT</version>
+            <version>4.3.0.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud.commons</groupId>

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

@@ -1981,6 +1981,7 @@ public class OrderServiceImpl implements Orderservice {
         }
         // 扩展字段中存储 sessionKey
         orderExtInfoDto.setSessionKey(createOrderVo.getSessionKey());
+        orderExtInfoDto.setFormId(createOrderVo.getFormId());
         return orderExtInfoDto;
     }
 
@@ -2044,11 +2045,16 @@ public class OrderServiceImpl implements Orderservice {
 //        orderExtInfo = orderAdapter.getOrderExtInfo(orderPayResponse, orderExtInfo);
         orderExtInfo.setOpenid(orderPayResponse.getOpenId());
         String prepayId = "";
+        OrderPayResponse.PayOrderBean payOrder = orderPayResponse.getPayOrder();
         // StringUtils 依赖修改
-        if (orderPayResponse.getPayOrder() != null && !StringUtils.isEmpty(orderPayResponse.getPayOrder().getPackageX())) {
-            String[] prepayIds = orderPayResponse.getPayOrder().getPackageX().split("=");
+        if (payOrder != null && !StringUtils.isEmpty(payOrder.getPackageX())) {
+            String[] prepayIds = payOrder.getPackageX().split("=");
             prepayId = prepayIds.length > 1 ? prepayIds[1] : "";
         }
+        //支付宝保存交易流水号发送支付宝模板消息
+        if (payOrder != null && !StringUtils.isEmpty(payOrder.getAliPayOrder())) {
+            prepayId = payOrder.getAliPayOrder();
+        }
         orderExtInfo.setPrepayId(prepayId);
 
         OrderEditRequest orderEditRequest = new OrderEditRequest(orderPayResponse.getPayTransId(),

ordercenter-sdk/readme.md

@@ -7,4 +7,5 @@
 | 1.1.1.RELEASE| 1.9.9需求打包release版本  | 丁凯 | 2020-01-08  |
 | 1.1.2.RELEASE| 农工商订单submit  | 侯书虎 | 2020-01-13  |
 | 1.1.3.RELEASE| 开放平台创建订单  | 姜海波 | 2020-02-24  |
-| 1.1.4-SNAPSHOT | 优化活动订单 | 胡超 | 2020-02-10 |
\ No newline at end of file
+| 1.1.4-SNAPSHOT | 优化活动订单 | 胡超 | 2020-02-10 |
+| 1.1.6-SNAPSHOT | OrderExtInfo新增formId | wuping | 2020-02-27 |
\ No newline at end of file

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java

@@ -19,6 +19,8 @@ public class OrderExtInfoDto {
 
     private  String prepayId;
 
+    private  String formId;
+
     private String accessToken;
     /**
      * 到期时间