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); } 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(),