Merge branch 'feature/2020-1104-混合支付' into develop

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -695,6 +695,9 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setExtInfo(orderEdit.getExtInfo());
         request.setOrderClient(OrderClientType.SAAS.getIndex());
         request.setOrderPayItem(orderEdit.getOrderPayItem());
+        request.setPayChannel(orderEdit.getPayChannel());
+        request.setPayChannelName(orderEdit.getPayChannelName());
+        request.setPayChannelType(orderEdit.getPayChannelType());
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.editOrder(request, orderEdit.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
     }

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

@@ -28,5 +28,8 @@ public class UpdateOrderReq {
 
     private Integer orderClient;
     private List<PayItem> orderPayItem;
+    private String payChannel;
+    private String payChannelName;
+    private Byte payChannelType;
 
 }