From 1dbe309b33f1a48e97bfeecae675fe877533d10c Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Fri, 10 Feb 2023 09:29:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/web/controller/OrderPayController.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 97c315b7..548219cc 100644
--- a/hai-order/src/main/java/com/web/controller/OrderPayController.java
+++ b/hai-order/src/main/java/com/web/controller/OrderPayController.java
@@ -159,7 +159,11 @@ public class OrderPayController {
             } else if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE5.getNumber())) {
                 HighCoupon coupon = couponService.getCouponById(order.getHighChildOrderList().get(0).getGoodsId());
                 if (coupon.getCouponSource() != null && coupon.getCouponSource().equals(4)) {
-                    weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1634835264);
+                    if (order.getMemDiscountId() != null) {
+                        weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1614670195);
+                    } else {
+                        weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1634835264);
+                    }
                 } else {
                     weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1614670195);
                 }

From 5a260e61ac1b6b48140432af11564c416b60c5ad Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Fri, 10 Feb 2023 10:32:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hai/order/service/impl/OrderCreateHandleServiceImpl.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java b/hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java
index 0356baa2..74595c9e 100644
--- a/hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/order/service/impl/OrderCreateHandleServiceImpl.java
@@ -191,6 +191,9 @@ public class OrderCreateHandleServiceImpl implements OrderCreateHandleService {
 
             // 贵州中石化
             if (coupon.getCouponSource().equals(4)) {
+                if (secConfigService.isConfig("GZ_SINOPEC_STATUS", "true") == true) {
+                    throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "卡券维护中，请稍后重试！");
+                }
                 // 下单请求
                 JSONObject jsonObject = HuiLianTongConfig.recharge(createOrderChild.getOrderNo(),
                         childOrder.getSaleCount(),