From 51d26bf01681a2c4ad80e07e063ec224597a53d7 Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Mon, 8 Apr 2024 15:20:05 +0800
Subject: [PATCH] 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
---
 .../java/com/web/controller/OrderPayController.java  | 12 ++++++++++++
 .../src/main/java/com/hai/enum_type/GasChannel.java  |  1 +
 2 files changed, 13 insertions(+)

diff --git a/hai-order/src/main/java/com/web/controller/OrderPayController.java b/hai-order/src/main/java/com/web/controller/OrderPayController.java
index c8239753..abefb50d 100644
--- a/hai-order/src/main/java/com/web/controller/OrderPayController.java
+++ b/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 {
diff --git a/hai-service/src/main/java/com/hai/enum_type/GasChannel.java b/hai-service/src/main/java/com/hai/enum_type/GasChannel.java
index a3fe2053..4c75c90d 100644
--- a/hai-service/src/main/java/com/hai/enum_type/GasChannel.java
+++ b/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;