From fa0cc541debddcda57fb7183dd309b89cda6df0b Mon Sep 17 00:00:00 2001 From: xiafang Date: Tue, 20 Jun 2023 08:35:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=9C=8D=E5=8A=A1=E5=95=86=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E4=B8=8B=E9=A2=84=E6=94=AF=E4=BB=98=E7=9A=84=E7=AD=BE?= =?UTF-8?q?=E5=90=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #I7829T --- .../payment/wechat/v3/WechatPartnerPayApi.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPartnerPayApi.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPartnerPayApi.java index 369c431..c8c0d68 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPartnerPayApi.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPartnerPayApi.java @@ -80,7 +80,7 @@ public class WechatPartnerPayApi extends AbstractApi { WechatMetaBean wechatMetaBean = wechatMetaContainer.getWechatMeta(tenantId()); PrivateKey privateKey = wechatMetaBean.getKeyPair().getPrivate(); - String subAppid = partnerPayParams.getSubAppid(); + String spAppid = partnerPayParams.getSpAppid(); long epochSecond = LocalDateTime.now() .toEpochSecond(ZoneOffset.of("+8")); String timestamp = String.valueOf(epochSecond); @@ -89,9 +89,8 @@ public class WechatPartnerPayApi extends AbstractApi { .toString() .replaceAll("-", ""); String prepayId = body.get("prepay_id").asText(); - String paySign = signatureProvider.doRequestSign(privateKey, subAppid, timestamp, nonceStr, prepayId); - - body.put("appid", subAppid); + String paySign = signatureProvider.doRequestSign(privateKey, spAppid, timestamp, nonceStr, prepayId); + body.put("appid", spAppid); body.put("partnerid", partnerPayParams.getSubMchid()); body.put("prepayid", prepayId); body.put("package", "Sign=WXPay"); @@ -129,7 +128,7 @@ public class WechatPartnerPayApi extends AbstractApi { WechatMetaBean wechatMetaBean = wechatMetaContainer.getWechatMeta(tenantId()); PrivateKey privateKey = wechatMetaBean.getKeyPair().getPrivate(); - String subAppid = partnerPayParams.getSubAppid(); + String spAppid = partnerPayParams.getSpAppid(); long epochSecond = LocalDateTime.now() .toEpochSecond(ZoneOffset.of("+8")); String timestamp = String.valueOf(epochSecond); @@ -138,9 +137,8 @@ public class WechatPartnerPayApi extends AbstractApi { .toString() .replaceAll("-", ""); String packageStr = "prepay_id=" + body.get("prepay_id").asText(); - String paySign = signatureProvider.doRequestSign(privateKey, subAppid, timestamp, nonceStr, packageStr); - - body.put("appId", subAppid); + String paySign = signatureProvider.doRequestSign(privateKey, spAppid, timestamp, nonceStr, packageStr); + body.put("appid", spAppid); body.put("timeStamp", timestamp); body.put("nonceStr", nonceStr); body.put("package", packageStr);