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] =?UTF-8?q?fixed(pay):=20=E5=85=BC=E5=AE=B9=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=94=AF=E4=BB=98=E5=85=AC=E9=92=A5=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E5=B9=B6=E8=A7=A3=E5=86=B3=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pay/core/client/impl/weixin/AbstractWxPayClient.java     | 5 +++++
 1 file changed, 5 insertions(+)

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 4ee904bbb1..1db6bd146a 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);
         }