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/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -174,6 +174,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

@@ -165,6 +165,8 @@ public class BaseCreateOrderRequest extends BaseConfig {
      */
     private String menuType;
 
+    private Byte payChannelType;
+
     @Data
     public static class DeliveryTypeInfo {
         /**

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

@@ -255,6 +255,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

@@ -190,7 +190,7 @@ public class CreateOrderVo {
     /**
      * 渠道类型 OrderChannelType
      */
-    private String channelType;
+    private Byte channelType;
 
     /**
      * 微信配送地址信息

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;
+
 }