From c416fb9b3de038940cfb3ed21db928205ddc6488 Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Fri, 17 Oct 2025 17:47:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E7=8F=AD=E6=8A=A5=E5=90=8D?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=8D=A2=E6=88=90=E7=81=B5=E6=9E=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../peanut/modules/pay/weChatPay/config/WechatPayConfig.java  | 2 ++
 .../modules/pay/weChatPay/controller/WeChatPayController.java | 3 +++
 .../peanut/modules/pay/weChatPay/dto/WechatPaymentInfo.java   | 4 ++++
 .../modules/pay/weChatPay/service/impl/WxpayServiceImpl.java  | 3 +++
 src/main/resources/application-dev.yml                        | 2 ++
 src/main/resources/application-prod.yml                       | 2 ++
 6 files changed, 16 insertions(+)

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<PayWechatOrderEntity> 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<PayWechatOrderDao, PayWechatOr
         paramMap.put("appid", appid);
         // 商户 id
         paramMap.put("mchid", wechatPayConfig.getMchId());
+        if ("trainingClass".equals(paymentInfo.getOrderType())){
+            paramMap.put("mchid", wechatPayConfig.getLsMchId());
+        }
         // 描述
         paramMap.put("description", "微信支付");
         // 订单编号
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index db70ddcf..40f96ed5 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -95,6 +95,8 @@ wxpay:
   xlkjappId: wxd6bfeec65bc7abee
   thyyappId: wx5c50e3696028d2ec
   mchId: 1612860909
+  #灵枢商户号
+  lsMchId: 1612860909
   payUrl: https://api.mch.weixin.qq.com/v3/pay/transactions/app
   notifyUrl: http://c6f94c98.natappfree.cc/pb/pay/payNotify
   refundUrl: https://api.mch.weixin.qq.com/v3/refund/domestic/refunds
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 5718d8f6..0b01744d 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -93,6 +93,8 @@ wxpay:
   xlkjappId: wxd6bfeec65bc7abee
   thyyappId: wx5c50e3696028d2ec
   mchId: 1612860909
+  #灵枢商户号
+  lsMchId: 1612860909
   payUrl: https://api.mch.weixin.qq.com/v3/pay/transactions/app
   notifyUrl: https://api.nuttyreading.com/pay/payNotify
   refundUrl: https://api.mch.weixin.qq.com/v3/refund/domestic/refunds