From d0c6be0f87b794799dcccfee3bef8760b501ae37 Mon Sep 17 00:00:00 2001 From: yuanye <418471657@qq.com> Date: Mon, 17 Jun 2024 18:13:50 +0800 Subject: [PATCH] 1 --- .../com/web/controller/OrderPayController.java | 15 ++++++++++++++- 1 file changed, 14 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 803bcf63..dc6484ce 100644 --- a/hai-order/src/main/java/com/web/controller/OrderPayController.java +++ b/hai-order/src/main/java/com/web/controller/OrderPayController.java @@ -373,7 +373,20 @@ public class OrderPayController { weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1667177808); } else if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE12.getNumber())) { - weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1614670195); +// weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1614670195); +// + // 查询支付配置 + HighGasChannelConfig gasChannelConfig = gasChannelConfigService.getConfig(GasChannel.type2); + if (gasChannelConfig == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未配置支付参数，请稍后重试！"); + } + + payPlatformType = gasChannelConfig.getPayPlatformType(); + payPlatformKey = gasChannelConfig.getPayPlatformMerKey(); + payPlatformMerNo = gasChannelConfig.getPayPlatformMerNo(); + + weChatPayReqInfo.setSub_mch_id(gasChannelConfig.getPayPlatformMerNo()); + profitSharing = gasChannelConfig.getProfitSharingStatus().equals(true) ? "Y" : "N"; } else if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE15.getNumber())) { // 查询支付配置 HighGasChannelConfig gasChannelConfig = gasChannelConfigService.getConfig(GasChannel.type7);