Merge branch 'new-dev' into 2.0-dev

# Conflicts:
#	hai-service/src/main/java/com/hai/openApi/service/impl/ApiOrderCreateHandleServiceImpl.java
#	hai-service/src/main/java/com/hai/openApi/service/impl/ApiOrderServiceImpl.java

hai-order/src/main/java/com/web/controller/OrderPayController.java

@@ -218,6 +218,18 @@ public class OrderPayController {
                         payPlatformMerNo =  gasChannelConfig.getPayPlatformMerNo();
                         payPlatformKey =  gasChannelConfig.getPayPlatformMerKey();
 
+                        weChatPayReqInfo.setSub_mch_id(gasChannelConfig.getPayPlatformMerNo());
+                        profitSharing = gasChannelConfig.getProfitSharingStatus().equals(true) ? "Y" : "N";
+                    }else if(coupon.getCouponSource().equals(10)) {
+                        // 查询支付配置
+                        HighGasChannelConfig gasChannelConfig = gasChannelConfigService.getConfig(GasChannel.type8);
+                        if (gasChannelConfig == null) {
+                            throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未配置支付参数，请稍后重试！");
+                        }
+                        payPlatformType =  gasChannelConfig.getPayPlatformType();
+                        payPlatformMerNo =  gasChannelConfig.getPayPlatformMerNo();
+                        payPlatformKey =  gasChannelConfig.getPayPlatformMerKey();
+
                         weChatPayReqInfo.setSub_mch_id(gasChannelConfig.getPayPlatformMerNo());
                         profitSharing = gasChannelConfig.getProfitSharingStatus().equals(true) ? "Y" : "N";
                     } else {

hai-service/src/main/java/com/hai/enum_type/GasChannel.java

@@ -13,6 +13,7 @@ public enum GasChannel {
     type5(5 , "paylo系统"),
     type6(6 , "点点网络"),
     type7(7 , "烨歌百货"),
+    type8(8 , "智行九州"),
     ;
 
     private Integer type;