fix:

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

@@ -2785,9 +2785,6 @@ public class OrderAdapter {
             createOrderResponseVo.setOrderType(getNewOrderType(orderBean.getType(), orderBean.getGmtExpect()));
         }
         createOrderResponseVo.setOrderStr(payOrderBean == null ? "" : payOrderBean.getAliPayOrder());
-        if(CollectionUtils.isNotEmpty(orderPayResponse.getPayItem())) {
-            //createOrderResponseVo
-        }
         return createOrderResponseVo;
     }
 
@@ -3588,16 +3585,19 @@ public class OrderAdapter {
         responseDto.setPayId("");
 
         OrderPayResponse.PayOrderBean payBean = new OrderPayResponse.PayOrderBean();
-        payBean.setAppid(payPlatform.getAppId());
-        payBean.setNonceStr(payPlatform.getNonceStr());
-        payBean.setPackageX(payPlatform.get_package());
-        payBean.setSign(payPlatform.getPaySign());
-        payBean.setSignType(payPlatform.getPaySignType());
-        payBean.setTimestamp(payPlatform.getTimestamp());
-        payBean.setAliPayOrder(payPlatform.getAliPayOrder());
-        responseDto.setPayOrder(payBean);
         responseDto.setPayTransId(payPlatform.getTransId());
         responseDto.setFmId(payPlatform.getFmTradeNo());
+        CombPayResponse.PayPlatform.PayOrderBean payOrderBean = payPlatform.getPayOrder();
+        if (null != payOrderBean) {
+            payBean.setAppid(payOrderBean.getAppid());
+            payBean.setNonceStr(payOrderBean.getNonceStr());
+            payBean.setPackageX(payOrderBean.getPackageX());
+            payBean.setSign(payOrderBean.getSign());
+            payBean.setSignType(payOrderBean.getSignType());
+            payBean.setTimestamp(payOrderBean.getTimestamp());
+            payBean.setAliPayOrder(payOrderBean.getAliPayOrder());
+            responseDto.setPayOrder(payBean);
+        }
         //供修改订单
         for (CombPayResponse.PayPlatform pt : payPlatforms) {
             PayItem payItem = new PayItem();

order-application-service/src/main/java/cn/freemud/entities/dto/pay/CombPayResponse.java

@@ -81,7 +81,32 @@ public class CombPayResponse {
 
         @ApiModelProperty(value = "间联单号")
         private String transId;
-        @ApiModelProperty(value = "支付宝秘钥参数")
-        private String aliPayOrder;
+        @ApiModelProperty(value = "")
+        private PayOrderBean payOrder;
+        @Data
+        public static class PayOrderBean {
+            /**
+             * appid : wx3ab08e23966343fe
+             * package : prepay_id=wx25143630149413bcd9fbad100070370076
+             * nonce_str : -610630281
+             * sign : D320B2B74D858EBE16841F43AE70E757
+             * timestamp : 1527230190
+             * signType : MD5
+             */
+            private String appid;
+
+            @JsonProperty("package")
+            private String packageX;
+
+            //@JsonProperty("nonce_str")
+            private String nonceStr;
+
+            private String sign;
+
+            private String timestamp;
+
+            private String signType;
+            private String aliPayOrder;
+        }
     }
 }

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

@@ -778,7 +778,7 @@ public class CheckOrder {
                 BigDecimal total = new BigDecimal(totalVAmount);
                 BigDecimal svcAmounts =  new BigDecimal(svcAmount + svcVAmount);
                 BigDecimal cashAmout = total.subtract(svcAmounts);
-                createOrderVo.setOrderPayItemCreateReqList(orderAdapter.setOrderPayItem(cashAmout,svcAmounts,createOrderVo.getPayChannelType()));
+                createOrderVo.setOrderPayItemCreateReqList(orderAdapter.setOrderPayItem(cashAmout,svcAmounts,Byte.parseByte(createOrderVo.getChannel())));
                 createOrderVo.setPayChannelType(PayChannelType.COMB.getIndex());
 
                 createOrderVo.setCashAmount(cashAmout);

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/PayChannelType.java

@@ -8,13 +8,11 @@ import lombok.Getter;
 public enum PayChannelType {
 
     WECHAT((byte)1,"10211","微信"),
-    SVC((byte)2,"10102","储值卡"),
-    ALIPAY((byte)3,"10300","支付宝"),
-    COMB((byte)4,"","混合支付"),
+    ALIPAY((byte)2,"10300","支付宝"),
+    SVC((byte)3,"10102","储值卡"),
+    COMB((byte)4,"10212","混合支付"),
     USVCP((byte)5,"10556", "电子风味卡支付");
 
-
-
     private Byte index;
     private String ebcode;
     private String name;