From c4a43da49855ab600bcf43befb738cd6aff3dc1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Wed, 5 Mar 2025 23:14:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E5=BE=AE=E4=BF=A1V3?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/service/payment/WechatPayment.php     |  3 ++
 .../src/view/config/form_wechat.html          | 45 ++++++++++++++-----
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/plugin/think-plugs-payment/src/service/payment/WechatPayment.php b/plugin/think-plugs-payment/src/service/payment/WechatPayment.php
index 357b4fa10..708d49b27 100644
--- a/plugin/think-plugs-payment/src/service/payment/WechatPayment.php
+++ b/plugin/think-plugs-payment/src/service/payment/WechatPayment.php
@@ -93,5 +93,8 @@ abstract class WechatPayment implements PaymentInterface
         $this->config['ssl_key'] = $local->path($sslKey, true);
         $this->config['cert_public'] = $this->config['ssl_cer'];
         $this->config['cert_private'] = $this->config['ssl_key'];
+        $this->config['cert_serial'] = $this->cfgParams['wechat_mch_cer_id'] ?? '';
+        $this->config['mp_cert_serial'] = $this->cfgParams['wechat_mch_v3_paycer_id'] ?? '';
+        $this->config['mp_cert_content'] = $this->cfgParams['wechat_mch_v3_paycer_text'] ?? '';
     }
 }
\ No newline at end of file
diff --git a/plugin/think-plugs-payment/src/view/config/form_wechat.html b/plugin/think-plugs-payment/src/view/config/form_wechat.html
index f3f9d2c32..bc3fc639d 100644
--- a/plugin/think-plugs-payment/src/view/config/form_wechat.html
+++ b/plugin/think-plugs-payment/src/view/config/form_wechat.html
@@ -38,17 +38,42 @@
     <span class="help-block"><b>必填，</b>微信商户密钥，需要在微信商户平台操作设置密码并获取密钥，建议定期更换密钥。</span>
 </label>
 
-<label class="layui-form-item block relative">
-    <span class="help-label"><b>商户证书公钥内容</b>（ 需要填写文件的全部内容 ）</span>
-    <textarea class="layui-textarea font-code" name="wechat_mch_cer_text" required vali-name="证书内容" placeholder="请输入微信商户证书内容">{$vo.content.wechat_mch_cer_text|default=''}</textarea>
-    <span class="help-block"><b>必填，</b>从商户平台上下载支付证书，解压并取得其中的 apiclient_cert.pem 用记事本打开并复制文件内容填至此处。</span>
-</label>
+<fieldset class="layui-bg-gray">
+    <legend><span class="layui-badge layui-bg-blue">微信商户证书</span></legend>
+    <div>
+        <label class="layui-form-item block relative">
+            <span class="help-label"><b>商户证书公钥序号</b>WeChat Payment Serial</span>
+            <input class="layui-input font-code" name="wechat_mch_cer_id" vali-name="支付公钥ID" placeholder="请输入商户证书公钥序号" value="{$vo.content.wechat_mch_cer_id|default=''}">
+            <span class="help-block"><b>可选，</b>商户证书公钥序号，需要在微信商户平台生成商户证书时，可以获取到公钥序号。</span>
+        </label>
+        <label class="layui-form-item block relative">
+            <span class="help-label"><b>商户证书公钥内容</b>（ 需要填写文件的全部内容 ）</span>
+            <textarea class="layui-textarea font-code" name="wechat_mch_cer_text" required vali-name="证书内容" placeholder="请输入商户证书公钥内容">{$vo.content.wechat_mch_cer_text|default=''}</textarea>
+            <span class="help-block"><b>必填，</b>从商户平台上下载支付证书，解压并取得其中的 apiclient_cert.pem 用记事本打开并复制文件内容填至此处。</span>
+        </label>
+        <label class="layui-form-item block relative">
+            <span class="help-label"><b>微信商户密钥文件内容</b>（ 需要填写文件的全部内容 ）</span>
+            <textarea class="layui-textarea font-code" name="wechat_mch_key_text" required vali-name="密钥内容" placeholder="请输入微信商户密钥文件内容">{$vo.content.wechat_mch_key_text|default=''}</textarea>
+            <span class="help-block"><b>必填，</b>从商户平台上下载支付证书，解压并取得其中的 apiclient_key.pem 用记事本打开并复制文件内容填至此处。</span>
+        </label>
+    </div>
+</fieldset>
 
-<label class="layui-form-item block relative">
-    <span class="help-label"><b>微信商户密钥文件内容</b>（ 需要填写文件的全部内容 ）</span>
-    <textarea class="layui-textarea font-code" name="wechat_mch_key_text" required vali-name="密钥内容" placeholder="请输入微信商户密钥内容">{$vo.content.wechat_mch_key_text|default=''}</textarea>
-    <span class="help-block"><b>必填，</b>从商户平台上下载支付证书，解压并取得其中的 apiclient_key.pem 用记事本打开并复制文件内容填至此处。</span>
-</label>
+<fieldset data-wechat-version="v3" class="layui-hide layui-bg-gray">
+    <legend><span class="layui-badge layui-bg-blue">微信支付公钥</span></legend>
+    <div>
+        <label class="layui-form-item block relative">
+            <span class="help-label"><b>微信支付公钥 ID</b>WeChat Payment CertId</span>
+            <input class="layui-input font-code" name="wechat_mch_v3_paycer_id" vali-name="支付公钥ID" placeholder="请输入微信支付公钥ID" value="{$vo.content.wechat_mch_v3_paycer_id|default=''}">
+            <span class="help-block"><b>可选，</b>微信商户密钥，需要在微信商户平台操作设置密码并获取密钥，建议定期更换密钥。</span>
+        </label>
+        <label class="layui-form-item block relative">
+            <span class="help-label"><b>微信支付公钥内容</b>（ 需要填写文件的全部内容 ）</span>
+            <textarea class="layui-textarea font-code" name="wechat_mch_v3_paycer_text" vali-name="支付公钥" placeholder="请输入微信支付公钥内容">{$vo.content.wechat_mch_v3_paycer_text|default=''}</textarea>
+            <span class="help-block"><b>可选，</b>从商户平台上下载支付证书，解压并取得其中的 pub_key.pem 用记事本打开并复制文件内容填至此处。</span>
+        </label>
+    </div>
+</fieldset>
 
 <script>
     $(function () {