From 9242f8050096825e1024d40c2c0feb4af585bdeb Mon Sep 17 00:00:00 2001 From: DaxPay Dev Date: Sun, 5 Jul 2026 17:21:33 +0800 Subject: [PATCH] =?UTF-8?q?fix(wechat):=20JSAPI/=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E6=94=AF=E4=BB=98=E8=BF=94=E5=9B=9Ejsapi=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B(=E5=AF=B9=E9=BD=90=E5=95=86=E4=B8=9A=E7=89=88)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../channel/wechat/client/enums/WechatPayBodyType.java | 8 +++++--- .../wechat/service/payment/isv/WechatIsvPayService.java | 3 ++- .../wechat/service/payment/pay/WechatPayService.java | 3 ++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/client/enums/WechatPayBodyType.java b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/client/enums/WechatPayBodyType.java index aeb953452..49227ab28 100644 --- a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/client/enums/WechatPayBodyType.java +++ b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/client/enums/WechatPayBodyType.java @@ -8,8 +8,10 @@ public enum WechatPayBodyType { LINK, /// 二维码内容(NATIVE 扫码场景) QR_CODE, - /// 调起参数 JSON(JSAPI / 小程序场景) - IDENTIFIER, + /// JSAPI/小程序调起参数 JSON + JSAPI, /// APP 调起参数 JSON(APP 场景) - APP_ORDER_STR; + APP_ORDER_STR, + /// 通用标识码(兜底) + IDENTIFIER; } diff --git a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/payment/isv/WechatIsvPayService.java b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/payment/isv/WechatIsvPayService.java index a4d867543..3c214a4b7 100644 --- a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/payment/isv/WechatIsvPayService.java +++ b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/payment/isv/WechatIsvPayService.java @@ -113,7 +113,8 @@ public class WechatIsvPayService { switch (bodyType) { case LINK -> bo.setPayBodyType(PayBodyTypeEnum.LINK); case QR_CODE -> bo.setPayBodyType(PayBodyTypeEnum.QR_CODE); - case IDENTIFIER, APP_ORDER_STR -> bo.setPayBodyType(PayBodyTypeEnum.IDENTIFIER); + case JSAPI -> bo.setPayBodyType(PayBodyTypeEnum.JSAPI); + case APP_ORDER_STR, IDENTIFIER -> bo.setPayBodyType(PayBodyTypeEnum.IDENTIFIER); } } diff --git a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/payment/pay/WechatPayService.java b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/payment/pay/WechatPayService.java index c99404dd8..326c01ad3 100644 --- a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/payment/pay/WechatPayService.java +++ b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/service/payment/pay/WechatPayService.java @@ -114,7 +114,8 @@ public class WechatPayService { switch (bodyType) { case LINK -> bo.setPayBodyType(PayBodyTypeEnum.LINK); case QR_CODE -> bo.setPayBodyType(PayBodyTypeEnum.QR_CODE); - case IDENTIFIER, APP_ORDER_STR -> bo.setPayBodyType(PayBodyTypeEnum.IDENTIFIER); + case JSAPI -> bo.setPayBodyType(PayBodyTypeEnum.JSAPI); + case APP_ORDER_STR, IDENTIFIER -> bo.setPayBodyType(PayBodyTypeEnum.IDENTIFIER); } }