|
|
@ -354,6 +354,9 @@ public class OrderPayController { |
|
|
|
payPlatformKey = gasChannelConfig.getPayPlatformMerKey(); |
|
|
|
payPlatformKey = gasChannelConfig.getPayPlatformMerKey(); |
|
|
|
weChatPayReqInfo.setSub_mch_id(gasChannelConfig.getPayPlatformMerNo()); |
|
|
|
weChatPayReqInfo.setSub_mch_id(gasChannelConfig.getPayPlatformMerNo()); |
|
|
|
profitSharing = gasChannelConfig.getProfitSharingStatus().equals(true) ? "Y" : "N"; |
|
|
|
profitSharing = gasChannelConfig.getProfitSharingStatus().equals(true) ? "Y" : "N"; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} else if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE16.getNumber())) { |
|
|
|
|
|
|
|
weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1614670195); |
|
|
|
} else if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE17.getNumber())) { |
|
|
|
} else if (order.getProductType().equals(OrderProductType.PRODUCT_TYPE17.getNumber())) { |
|
|
|
weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1614670195); |
|
|
|
weChatPayReqInfo.setSub_mch_id(WxOrderConfig.MCH_ID_1614670195); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|