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

@@ -373,20 +373,7 @@ 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);