From 3cd1a6507eb96b3b98686bad01d89c075009c23b Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Thu, 29 May 2025 13:25:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0thyy=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/pay/alipay/service/impl/AliPayServiceImpl.java | 2 +- .../peanut/modules/pay/weChatPay/config/WechatPayConfig.java | 2 ++ .../modules/pay/weChatPay/controller/WeChatPayController.java | 2 ++ .../modules/pay/weChatPay/service/impl/WxpayServiceImpl.java | 2 ++ src/main/resources/application-dev.yml | 2 +- src/main/resources/application-dev1.yml | 1 + src/main/resources/application-prod.yml | 1 + src/main/resources/application-test.yml | 2 +- 8 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java b/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java index 1f0d549a..49006f53 100644 --- a/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java +++ b/src/main/java/com/peanut/modules/pay/alipay/service/impl/AliPayServiceImpl.java @@ -201,7 +201,7 @@ public class AliPayServiceImpl implements AliPayService { userVipService.openVipForUser(order); } - if ("vip".equals(subject)) { + if ("aiVip".equals(subject)) { //更新 订单 记录 buyOrderService.updateOrderStatus(Integer.valueOf(customerid),oldPayZfbOrderEntity.getRelevanceoid(),"2"); //处理抵扣积分 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 cc16cfb1..4b8d47ad 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 @@ -49,6 +49,8 @@ public class WechatPayConfig implements Serializable { private String wumenappId; @Value("${wxpay.xlkjappId}") private String xlkjappId; + @Value("${wxpay.thyyappId}") + private String thyyappId; /** * 商户号 */ 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 2cf91d14..0357af69 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 @@ -72,6 +72,8 @@ public class WeChatPayController { appid = wechatPayConfig.getWumenappId(); } else if ("xlkj".equals(paymentInfo.getAppName())) { appid = wechatPayConfig.getXlkjappId(); + } else if ("thyy".equals(paymentInfo.getAppName())) { + appid = wechatPayConfig.getThyyappId(); } Map map = new HashMap<>(); paramMap.put("appid", appid); 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 0617d62d..dfb123e2 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 @@ -100,6 +100,8 @@ public class WxpayServiceImpl extends ServiceImpl