Merge branch 'feature-2020/5/18-1.9.23-下单增加支付方式-海波' into develop

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/CreateOrderRequest.java

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.7.9-SNAPSHOT</version>
+    <version>1.8.0-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.6-SNAPSHOT</version>
+            <version>1.4.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

assortment-ordercenter-sdk/readme.md

@@ -71,4 +71,5 @@
 | 1.7.4-SNAPSHOT| 客如云 | 海波 | 2020-05-15 |
 | 1.7.6-SNAPSHOT| 订单查询返回配送渠道字段 | 雷后领 | 2020-05-15 |
 | 1.7.7-SNAPSHOT| 聚合订单综合查询新增新订单类型  | wuping | 2020-05-15 |
-| 1.7.8-SNAPSHOT| 预约单接单后提醒时间区分外卖自提  | wuping | 2020-05-18 |
\ No newline at end of file
+| 1.7.8-SNAPSHOT| 预约单接单后提醒时间区分外卖自提  | wuping | 2020-05-18 |
+| 1.8.0-SNAPSHOT| 增加订单支付类型  | 海波 | 2020-05-18 |
\ 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.7.8-SNAPSHOT</version>
+            <version>1.8.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -255,7 +255,6 @@ public class OrderAdapter {
             activityUpdateStockRequest.setStock(stocks);
             createOrderDto.setActivityUpdateStockRequest(activityUpdateStockRequest);
         }
-        createOrderDto.setPayChannelType(createOrderVo.getPayChannelType());
         return createOrderDto;
     }
 
@@ -531,6 +530,7 @@ public class OrderAdapter {
         createOrderDto.setBarCounter(createOrderVo.getTableNumber());
         createOrderDto.setOperator(createOrderVo.getUserName());
         createOrderDto.setMenuType(BusinessTypeEnum.getByCode(createOrderVo.getMenuType()));
+        createOrderDto.setPayChannelType(createOrderVo.getPayChannelType());
         return createOrderDto;
     }
 

order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java

@@ -159,6 +159,11 @@ public class CreateOrderVo {
      */
     public UserDeliveryInfoDto userDeliveryInfoDto;
 
+    /**
+     * 下单支付渠道类型
+     */
+    private Byte payChannelType;
+
     @Valid
     private PremiumExchangeActivity premiumExchangeActivity;
     /**

ordercenter-sdk/pom.xml

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

ordercenter-sdk/readme.md

@@ -35,4 +35,5 @@
 | 1.2.4.RELEASE | 发送pos消息中心新增字段 | 侯书虎 | 2020-05-11 |
 | 1.2.5.RELEASE | 取消接口新增超时时间字段 | wuping | 2020-05-12 |
 | 1.4.4-SNAPSHOT | 规范extInfo类 | 侯书虎 | 2020-05-14 |
-| 1.4.5-SNAPSHOT | 客如云接口 | 海波 | 2020-05-14 |
\ No newline at end of file
+| 1.4.5-SNAPSHOT | 客如云接口 | 海波 | 2020-05-14 |
+| 1.4.7-SNAPSHOT | 增加订单支付方式类型 | 海波 | 2020-05-18 |
\ No newline at end of file