From b94106fd57a779f2a6a0b9f81f68a68d3410aca4 Mon Sep 17 00:00:00 2001
From: kongkong <huangyangcong@gmail.com>
Date: Wed, 12 Nov 2025 13:41:52 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20#3757=20=E3=80=90=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E3=80=91=E4=BF=AE=E5=A4=8D=E5=BD=93=E5=8F=AA?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=20privateCertString=20=E6=88=96=20PrivateCer?=
 =?UTF-8?q?tContent=20=E6=97=B6=20certSerialNo=20=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E8=A2=AB=E6=AD=A3=E7=A1=AE=E7=94=9F=E6=88=90=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../binarywang/wxpay/config/WxPayConfig.java  |  4 +-
 .../impl/BaseWxPayServiceImplTest.java        | 41 +++++++++++++++++++
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java
index 43da17f04..7e2774400 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java
@@ -341,7 +341,7 @@ public class WxPayConfig {
         certificate = (X509Certificate) objects[1];
         this.certSerialNo = certificate.getSerialNumber().toString(16).toUpperCase();
       }
-      if (certificate == null && StringUtils.isBlank(this.getCertSerialNo()) && StringUtils.isNotBlank(this.getPrivateCertPath())) {
+      if (certificate == null && StringUtils.isBlank(this.getCertSerialNo()) && (StringUtils.isNotBlank(this.getPrivateCertPath()) || StringUtils.isNotBlank(this.getPrivateCertString())) || this.getPrivateCertContent() != null) {
         try (InputStream certInputStream = this.loadConfigInputStream(this.getPrivateCertString(), this.getPrivateCertPath(),
           this.privateCertContent, "privateCertPath")) {
           certificate = PemUtils.loadCertificate(certInputStream);
@@ -349,7 +349,7 @@ public class WxPayConfig {
         this.certSerialNo = certificate.getSerialNumber().toString(16).toUpperCase();
       }
 
-      if (this.getPublicKeyString() != null || this.getPublicKeyPath() != null || this.publicKeyContent != null) {
+      if (StringUtils.isNotBlank(this.getPublicKeyString()) || StringUtils.isNotBlank(this.getPublicKeyPath()) || this.publicKeyContent != null) {
         if (StringUtils.isBlank(this.getPublicKeyId())) {
           throw new WxPayException("请确保和publicKeyId配套使用");
         }
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java
index 955071e10..bd24f188d 100644
--- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java
@@ -33,6 +33,7 @@ import org.testng.annotations.Test;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Calendar;
@@ -976,4 +977,44 @@ public class BaseWxPayServiceImplTest {
     WxPayUnifiedOrderV3Result.JsapiResult result = payService.createPartnerOrderV3(TradeTypeEnum.JSAPI, request);
     System.out.println(result);
   }
+
+  @Test
+  public void test_certSerialNoExtractedFromPrivateCertContentOrPrivateCertString() throws Exception {
+    WxPayConfig wxPayConfig = new WxPayConfig();
+    //服务商的参数
+    wxPayConfig.setMchId("xxx");
+    wxPayConfig.setAppId("xxx");
+    wxPayConfig.setApiV3Key("xxx");
+    wxPayConfig.setPrivateKeyContent("xxx".getBytes(StandardCharsets.UTF_8));
+    wxPayConfig.setPrivateCertContent("xxx".getBytes(StandardCharsets.UTF_8)
+    );
+    wxPayConfig.setPublicKeyId("xxx");
+    wxPayConfig.setPublicKeyContent("xxx".getBytes(StandardCharsets.UTF_8));
+    //创建支付服务
+    WxPayService wxPayService = new WxPayServiceImpl();
+    wxPayService.setConfig(wxPayConfig);
+
+    String outTradeNo = RandomUtils.getRandomStr();
+    String notifyUrl = "https://api.qq.com/";
+    System.out.println("outTradeNo = " + outTradeNo);
+    WxPayUnifiedOrderV3Request request = new WxPayUnifiedOrderV3Request();
+    request.setOutTradeNo(outTradeNo);
+    request.setNotifyUrl(notifyUrl);
+    request.setDescription("test");
+
+    WxPayUnifiedOrderV3Request.Payer payer = new WxPayUnifiedOrderV3Request.Payer();
+    payer.setOpenid("xxx");
+    request.setPayer(payer);
+
+    //构建金额信息
+    WxPayUnifiedOrderV3Request.Amount amount = new WxPayUnifiedOrderV3Request.Amount();
+    //设置币种信息
+    amount.setCurrency(WxPayConstants.CurrencyType.CNY);
+    //设置金额
+    amount.setTotal(BaseWxPayRequest.yuan2Fen(BigDecimal.ONE));
+    request.setAmount(amount);
+
+    wxPayService.createOrderV3(TradeTypeEnum.JSAPI, request);
+  }
+
 }