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

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

@@ -19,7 +19,9 @@ public class OrderEditRequest extends BaseConfig {
      * 自定义字段
      */
     private String extInfo;
-
+    private String payChannel;
+    private String payChannelName;
+    private Byte payChannelType;
     private List<PayItem> orderPayItem;
     public OrderEditRequest(String orderId, String extInfo) {
         this.orderId = orderId;

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

@@ -2754,6 +2754,9 @@ public class OrderServiceImpl implements Orderservice {
         //混合支付项
         if (CollectionUtils.isNotEmpty(orderPayResponse.getPayItem())) {
             orderEditRequest.setOrderPayItem(orderPayResponse.getPayItem());
+            orderEditRequest.setPayChannel(PayChannelType.COMB.getEbcode());
+            orderEditRequest.setPayChannelName(PayChannelType.COMB.getName());
+            orderEditRequest.setPayChannelType(PayChannelType.COMB.getIndex());
         }
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderEdit(orderEditRequest);
         if (!ObjectUtils.equals(ResponseCodeConstant.RESPONSE_SUCCESS, baseOrderResponse.getErrcode())) {

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/entities/PayItem.java

@@ -22,7 +22,7 @@ public  class PayItem {
     private String partnerId;
     private String fmTradeNo;
     private Integer payChannelType;
-    private Integer payChannelName;
+    private String payChannelName;
     private String transId;
     private String orderPayItemCode;
     private String outOrderNo;