From bb7eaa214c96a5e9638605fdb11a2cc7f1eeccd0 Mon Sep 17 00:00:00 2001
From: Leslie <i@iobiji.com>
Date: Tue, 14 Oct 2025 01:45:18 +0800
Subject: [PATCH] fixed(pay): 兼容微信支付公钥模式并解决报错问题

---
 yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/weixin/AbstractWxPayClient.java | 5 +++++
 1 file changed, 5 insertions(+), 0 deletions(-)

diff --git a/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/weixin/AbstractWxPayClient.java b/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/weixin/AbstractWxPayClient.java
index 4ee904b..1db6bd1 100644
--- a/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/weixin/AbstractWxPayClient.java
+++ b/yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/weixin/AbstractWxPayClient.java
@@ -72,6 +72,11 @@ public abstract class AbstractWxPayClient extends AbstractPayClient<WxPayClientC
             if (StrUtil.isNotBlank(config.getPublicKeyContent())) {
                 payConfig.setPrivateCertPath(FileUtils.createTempFile(Base64.decode(config.getPublicKeyContent())).getPath());
             }
+            // 兼容微信支付公钥模式(BeanUtil.copyProperties忽略了该字段，当切换为公钥模式时，需要手动设置该值)
+            // 解决当商户切换到公钥，废弃平台证书，导致报错无可用平台证书的问题
+            if (StrUtil.isNotBlank(config.getPublicKeyId()) && StrUtil.startWith(config.getPublicKeyId(), "PUB_KEY_ID")) {
+                payConfig.setPublicKeyContent(StrUtil.bytes(config.getPublicKeyContent()));
+            }
             // 特殊：强制使用微信公钥模式，避免灰度期间的问题！！！
             payConfig.setStrictlyNeedWechatPaySerial(true);
         }
--
libgit2 0.21.4