diff --git a/src/main/java/com/peanut/modules/pay/weChatPay/config/WechatPayConfig.java b/src/main/java/com/peanut/modules/pay/weChatPay/config/WechatPayConfig.java index 4b8d47ad..deeb3405 100644 --- a/src/main/java/com/peanut/modules/pay/weChatPay/config/WechatPayConfig.java +++ b/src/main/java/com/peanut/modules/pay/weChatPay/config/WechatPayConfig.java @@ -56,6 +56,8 @@ public class WechatPayConfig implements Serializable { */ @Value("${wxpay.mchId}") private String mchId; + @Value("${wxpay.lsMchId}") + private String lsMchId; /** * pay url */ diff --git a/src/main/java/com/peanut/modules/pay/weChatPay/controller/WeChatPayController.java b/src/main/java/com/peanut/modules/pay/weChatPay/controller/WeChatPayController.java index fcc04ab1..67795dcd 100644 --- a/src/main/java/com/peanut/modules/pay/weChatPay/controller/WeChatPayController.java +++ b/src/main/java/com/peanut/modules/pay/weChatPay/controller/WeChatPayController.java @@ -80,6 +80,9 @@ public class WeChatPayController { map.put("noncestr", nonceStr); map.put("package", "Sign=WXPay"); paramMap.put("mchid", wechatPayConfig.getMchId()); + if ("trainingClass".equals(paymentInfo.getOrderType())){ + paramMap.put("mchid", wechatPayConfig.getLsMchId()); + } QueryWrapper wechatOrderQueryWrapper = new QueryWrapper<>(); wechatOrderQueryWrapper.eq("order_sn", paymentInfo.getOrderSn()); PayWechatOrderEntity payWechatOrder = payWechatOrderService.getOne(wechatOrderQueryWrapper); diff --git a/src/main/java/com/peanut/modules/pay/weChatPay/dto/WechatPaymentInfo.java b/src/main/java/com/peanut/modules/pay/weChatPay/dto/WechatPaymentInfo.java index 663705bd..2e0de8a2 100644 --- a/src/main/java/com/peanut/modules/pay/weChatPay/dto/WechatPaymentInfo.java +++ b/src/main/java/com/peanut/modules/pay/weChatPay/dto/WechatPaymentInfo.java @@ -12,6 +12,10 @@ public class WechatPaymentInfo implements Serializable { * 订单号 */ private String orderSn; + /** + * 订单类型 + */ + private String orderType; /** * 订单 ID */ diff --git a/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java b/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java index accc41d6..09344f66 100644 --- a/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java +++ b/src/main/java/com/peanut/modules/pay/weChatPay/service/impl/WxpayServiceImpl.java @@ -109,6 +109,9 @@ public class WxpayServiceImpl extends ServiceImpl