Merge branches 'develop' and 'feature/20200522_买券订单创建_wuping' of…

Merge branches 'develop' and 'feature/20200522_买券订单创建_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

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

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.8.8-SNAPSHOT</version>
+    <version>1.8.9-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.4.12-SNAPSHOT</version>
+            <version>1.4.13-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

assortment-ordercenter-sdk/readme.md

@@ -65,4 +65,29 @@
 | 1.8.5-SNAPSHOT| 客如云增加字段  | 海波 | 2020-05-26 |
 | 1.8.6-SNAPSHOT| 增加完成时间戳字段  | 雷后领 | 2020-05-27**** |
 | 1.8.7-SNAPSHOT| 修改订单详情配送时间字段  | 茹祥 | 2020-05-27 |
-| 1.8.8-SNAPSHOT| 查询非码微店订单下载  | 梁崇福 | 2020-05-28 |
\ No newline at end of file
+| 1.8.8-SNAPSHOT| 查询非码微店订单下载  | 梁崇福 | 2020-05-28 |
+| 1.2.8.RELEASE | 增加延时队列 | 海波 | 2020-04-13 |
+| 1.2.9.RELEASE | oms接单 | 侯书虎 | 2020-04-13 |
+| 1.3.0.RELEASE | app订单 | 丁凯 | 2020-04-20 |
+| 1.3.1.RELEASE | queryOrderById返回新增商家、平台优惠 | 侯书虎 | 2020-04-20 |
+| 1.3.2.RELEASE | ext_info 增加stapleFood主食设置 | 李小二 | 2020-04-20 |
+| 1.3.3.RELEASE | 第三方外卖单配送费类型与新用户立减类型重复区分 | wuping | 2020-04-21 |
+| 1.3.4.RELEASE | 记录真实配送费 | 海波 | 2020-04-27 |
+| 1.3.5.RELEASE | oms正向履单流程 | 侯书虎 | 2020-04-27 |
+| 1.3.6.RELEASE | 蜜雪 | 丁凯 | 2020-04-27 |
+| 1.3.7.RELEASE | 放开常用方法修饰符 | 李小二 | 2020-04-27 |
+| 1.3.8.RELEASE | 配送费时间金额 | 胡超 | 2020-05-11 |
+| 1.3.9.RELEASE | 发送pos消息中心新增字段 | 侯书虎 | 2020-05-11 |
+| 1.4.0.RELEASE | ES查询优化预约单提醒优化 | 海波 | 2020-05-11 |
+| 1.4.1.RELEASE | 返回储值卡支付订单支付金额 | 李小二 | 2020-05-11 |
+| 1.4.2.RELEASE | 申请退款切取消接口新增超时时间字段 | 伍平 | 2020-05-12 |
+| 1.4.3.RELEASE | 增加售后阶段 | 海波 | 2020-05-14 |
+| 1.4.4.RELEASE | 全单退增加是否退配送费 | 海波 | 2020-05-18 |
+| 1.4.5.RELEASE | 升级券码sdk |胡超 | 2020-05-18 |
+| 1.4.6.RELEASE | 券码接口新增组织机构 |胡超 | 2020-05-18 |
+| 1.4.7.RELEASE | 创建订单增加appid字段 | wuping | 2020-05-18 |
+| 1.4.8.RELEASE | 规范orderExtInfoDto | 侯书虎 | 2020-05-19 |
+| 1.3.4-SNAPSHOT | 返回售后单创建时间 | wuping | 2020-04-27 |
+| 1.3.5-SNAPSHOT | 取消订单增加任务 | wuping | 2020-04-28 |
+| 1.4.9.RELEASE | 售后单任务 | wuping | 2020-05-21 |
+| 1.8.9-SNAPSHOT | 用户订单和es综合查询接口新增订单业务类型集合 | wuping | 2020-06-01 |
\ No newline at end of file

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.8.8-SNAPSHOT</version>
+            <version>1.8.9-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -1669,9 +1669,9 @@ public class OrderAdapter {
             productVo.setSpecification(attributeNames);
         }
         if(StringUtils.isNotBlank(productBean.getExtInfo())){
-            OrderProductAddInfo orderProductAddInfo = gson.fromJson(productBean.getExtInfo(), OrderProductAddInfo.class);
-            if(CollectionUtils.isNotEmpty(orderProductAddInfo.getProductBindingCoupons())){
-                for (ProductBindingCouponType productBindingCouponType : orderProductAddInfo.getProductBindingCoupons()){
+            OrderProductAddInfoDto orderProductAddInfoDto = gson.fromJson(productBean.getExtInfo(), OrderProductAddInfoDto.class);
+            if(CollectionUtils.isNotEmpty(orderProductAddInfoDto.getProductBindingCoupons())){
+                for (ProductBindingCouponType productBindingCouponType : orderProductAddInfoDto.getProductBindingCoupons()){
                     InventedParentActivityVo inventedParentActivityVo = new InventedParentActivityVo();
 //                    inventedParentActivityVo.setActivityCode(productBindingCouponType.getActivityCode());
                     inventedParentActivityVo.setActivityName(productBindingCouponType.getActivityName());

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

@@ -337,8 +337,8 @@ public class SellCouponOrderServiceImpl {
                 if(productBindingCouponType.getActivityCode().equals(activeDetailVO.getActiveCode())){
                     ProductBindingCouponType productBindingCouponType2 = new ProductBindingCouponType();
                     productBindingCouponType2.setActivityCode(productBindingCouponType.getActivityCode());
-                    productBindingCouponType2.setActivityName(activeDetailVO.getActiveName());
                     productBindingCouponType2.setNum(productBindingCouponType.getNum());
+                    productBindingCouponType2.setActivityName(activeDetailVO.getActiveName());
                     productBindingCoupons.add(productBindingCouponType2);
                     break;
                 }

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.4.12-SNAPSHOT</version>
+    <version>1.4.13-SNAPSHOT</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/readme.md

@@ -29,4 +29,5 @@
 | 1.3.3-SNAPSHOT | 创建售后单接口增加任务 | wuping | 2020-04-27 |
 | 1.3.4-SNAPSHOT | 取消订单增加任务 | wuping | 2020-04-28 |
 | 1.2.10.RELEASE | 增加售后单任务 | wuping | 2020-05-21 |
-| 1.4.12-SNAPSHOT | 增加新接口：新增结算信息 | wuping | 2020-05-28 |
\ No newline at end of file
+| 1.4.12-SNAPSHOT | 增加新接口：新增结算信息 | wuping | 2020-05-28 |
+| 1.4.13-SNAPSHOT | 用户订单和es综合查询接口新增订单业务类型集合 | wuping | 2020-06-01 |
\ No newline at end of file