From d5729e828d00ac32294388f48597a1753404dcd7 Mon Sep 17 00:00:00 2001
From: wwwwwwwww <526125649@qq.com>
Date: Thu, 11 Jun 2026 18:38:56 +0800
Subject: [PATCH] 1

---
 .../src/pages/AdminPaymentConfig.tsx          | 25 ++++++++++++++++---
 video-gen-api/app/services/payment.py         |  1 -
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/video-gen-admin/src/pages/AdminPaymentConfig.tsx b/video-gen-admin/src/pages/AdminPaymentConfig.tsx
index a7f42eb8..22a33915 100644
--- a/video-gen-admin/src/pages/AdminPaymentConfig.tsx
+++ b/video-gen-admin/src/pages/AdminPaymentConfig.tsx
@@ -157,10 +157,29 @@ const AdminPaymentConfig: React.FC = () => {
           <Form.Item name="wechat_mch_id" label="商户号 (MchID)">
             <Input placeholder="微信支付商户号" size="large" disabled={!wechatEnabled} />
           </Form.Item>
-          <Form.Item name="wechat_private_key" label="商户私钥">
-            <Input.TextArea rows={5} placeholder="商户私钥 (PEM格式，包含-----BEGIN PRIVATE KEY-----和-----END PRIVATE KEY-----)" disabled={!wechatEnabled} />
+          <Form.Item 
+            name="wechat_private_key" 
+            label="商户私钥"
+            extra={`
+              ⚠️ 重要：请填写 apiclient_key.pem 的内容，不是 apiclient_cert.pem！
+              内容应该以 -----BEGIN PRIVATE KEY----- 或 -----BEGIN RSA PRIVATE KEY----- 开头
+            `}
+          >
+            <Input.TextArea 
+              rows={6} 
+              placeholder="
+-----BEGIN PRIVATE KEY-----
+...这里是私钥内容...
+-----END PRIVATE KEY-----
+              " 
+              disabled={!wechatEnabled} 
+            />
           </Form.Item>
-          <Form.Item name="wechat_cert_serial_no" label="商户证书序列号">
+          <Form.Item 
+            name="wechat_cert_serial_no" 
+            label="商户证书序列号"
+            extra="从 apiclient_cert.pem 中提取的证书序列号，或者在微信商户平台获取"
+          >
             <Input placeholder="商户证书序列号" size="large" disabled={!wechatEnabled} />
           </Form.Item>
           <Form.Item name="wechat_api_v3_key" label="API v3 密钥">
diff --git a/video-gen-api/app/services/payment.py b/video-gen-api/app/services/payment.py
index fd7fa51d..43c232cc 100644
--- a/video-gen-api/app/services/payment.py
+++ b/video-gen-api/app/services/payment.py
@@ -412,7 +412,6 @@ def _create_wechat_order(order: PaymentOrder, db_configs: dict[str, str]) -> str
     api_v3_key = db_configs.get("payment_wechat_api_v3_key", "")
     appid = db_configs.get("payment_wechat_appid", "")
     notify_url = db_configs.get("payment_wechat_notify_url", "")
-
     if not all([mch_id, private_key, cert_serial_no, api_v3_key, appid]):
         logger.warning("WeChat payment config missing in database")
         return None