Merge remote-tracking branch 'remotes/origin/feature/2020-1104-混合支付' into develop

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

@@ -6,6 +6,6 @@ import lombok.Data;
 public class PayPlatformVO {
     private String ebcode;
     private Long amount;
-    private String orderClient;
+    private String clientCode;
 
 }

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

@@ -3809,13 +3809,13 @@ public class OrderAdapter {
                 payPlatformVO.setAmount(orderPayItemCreateReq.getPayAmount().longValue());
                 payPlatformVO.setEbcode(orderPayItemCreateReq.getPayEbCode());
                 if (orderPayItemCreateReq.getPayEbCode().equals(PayChannelType.SVC.getEbcode())) {
-                    payPlatformVO.setOrderClient(orderPayItemCreateReq.getPayEbCode());
+                    payPlatformVO.setClientCode(orderPayItemCreateReq.getPayEbCode());
                 }
                 else if (orderPayItemCreateReq.getPayEbCode().equals(PayChannelType.WECHAT.getEbcode())) {
-                    payPlatformVO.setOrderClient(orderClient);
+                    payPlatformVO.setClientCode(orderClient);
                 }
                 else if (orderPayItemCreateReq.getPayEbCode().equals(PayChannelType.ALIPAY.getEbcode())) {
-                    payPlatformVO.setOrderClient(orderClient);
+                    payPlatformVO.setClientCode(orderClient);
                 }
                 platforms.add(payPlatformVO);
             }