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

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java
#	order-application-service/pom.xml
#	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.5.0.RELEASE</version>
+    <version>1.5.1.RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.2.10.RELEASE</version>
+            <version>1.2.11.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

assortment-ordercenter-sdk/readme.md

@@ -50,3 +50,4 @@
 | 1.5.0-RELEASE| 订单查询返回配送渠道字段 | 雷后领 | 2020-05-22 |
 | 1.7.7-SNAPSHOT| 聚合订单综合查询新增新订单类型  | wuping | 2020-05-15 |
 | 1.7.8-SNAPSHOT| 预约单接单后提醒时间区分外卖自提  | wuping | 2020-05-18 |
+| 1.5.1-RELEASE| 增加订单支付方式 | 海波 | 2020-05-25 |
\ No newline at end of file

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -173,6 +173,7 @@ public class OrderSdkAdapter {
         request.setPayTime(requestVO.getPayTime());
         request.setThirdStoreId(requestVO.getThirdShopId());
         request.setThirdOrderCode(requestVO.getThirdOrderCode());
+        request.setPayChannelType(requestVO.getPayChannelType());
         if (requestVO.getOrderStatus() != null) {
             request.setOrderState(getNewOrderStatus(requestVO.getOrderStatus().getCode()));
         }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java

@@ -163,6 +163,7 @@ public class BaseCreateOrderRequest extends BaseConfig {
      */
     private String region;
 
+    private Byte payChannelType;
 
     @Data
     public static class DeliveryTypeInfo {

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.5.0.RELEASE</version>
+            <version>1.5.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -253,6 +253,7 @@ public class OrderAdapter {
             activityUpdateStockRequest.setStock(stocks);
             createOrderDto.setActivityUpdateStockRequest(activityUpdateStockRequest);
         }
+        createOrderDto.setPayChannelType(createOrderVo.getPayChannelType());
         return createOrderDto;
     }
 

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

@@ -17,6 +17,7 @@ import io.swagger.annotations.ApiModelProperty;
 import cn.freemud.entities.dto.delivery.WeixinDeliveryAddressDto;
 import lombok.Builder;
 import lombok.Data;
+import org.hibernate.validator.constraints.NotEmpty;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
@@ -158,6 +159,11 @@ public class CreateOrderVo {
      */
     public UserDeliveryInfoDto userDeliveryInfoDto;
 
+    /**
+     * 下单支付渠道类型
+     */
+    private Byte payChannelType;
+
     @Valid
     private PremiumExchangeActivity premiumExchangeActivity;
     /**
@@ -190,7 +196,7 @@ public class CreateOrderVo {
     /**
      * 渠道类型 OrderChannelType
      */
-    private String channelType;
+    private Byte channelType;
 
     /**
      * 微信配送地址信息

ordercenter-sdk/pom.xml

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

ordercenter-sdk/readme.md

@@ -29,3 +29,4 @@
 | 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.2.11.RELEASE | 增加订单支付方式 | 海波 | 2020-05-25 |
\ No newline at end of file

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

@@ -216,4 +216,6 @@ public class CreateOrderRequest extends BaseRequest {
      */
     private String appId;
 
+    private Byte payChannelType;
+
 }