From d94da2129cbadbadc5583741fc91c421a590c35c Mon Sep 17 00:00:00 2001
From: "Logan.Li" <admin@attacker.club>
Date: Wed, 12 Aug 2026 23:47:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=94=AF=E4=BB=98=E9=A1=B5=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E8=B4=A7=E5=B8=81=E5=88=97=EF=BC=8C=E5=8C=85=E5=B9=B4?=
 =?UTF-8?q?/=E6=B0=B8=E4=B9=85=E8=B4=A7=E5=B8=81=E7=94=B1=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E8=87=AA=E5=8A=A8=E5=B8=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Product 映射只保留计划与 PROD_xxx；包年默认 CNY、永久默认 USD，避免误填干扰。
---
 backend/internal/service/payment/waffo.go |  4 +-
 frontend/src/views/Payments.vue           | 57 +++++++----------------
 2 files changed, 19 insertions(+), 42 deletions(-)

diff --git a/backend/internal/service/payment/waffo.go b/backend/internal/service/payment/waffo.go
index c8bb58d..cccd73e 100644
--- a/backend/internal/service/payment/waffo.go
+++ b/backend/internal/service/payment/waffo.go
@@ -453,15 +453,17 @@ func productIDForPlan(cfg WaffoConfig, planType string) string {
 }
 
 func currencyForPlan(cfg WaffoConfig, planType string) string {
-	switch strings.TrimSpace(planType) {
+	switch strings.TrimSpace(strings.ToLower(planType)) {
 	case "yearly", "monthly":
 		if cfg.CurrencyYearly != "" {
 			return cfg.CurrencyYearly
 		}
+		return "CNY" // OpsXshell 包年默认人民币 // Logan.Li
 	case "perpetual", "lifetime":
 		if cfg.CurrencyPerpetual != "" {
 			return cfg.CurrencyPerpetual
 		}
+		return "USD" // OpsXshell 永久默认美元 // Logan.Li
 	}
 	if cfg.Currency != "" {
 		return cfg.Currency
diff --git a/frontend/src/views/Payments.vue b/frontend/src/views/Payments.vue
index f9fd638..3d960ad 100644
--- a/frontend/src/views/Payments.vue
+++ b/frontend/src/views/Payments.vue
@@ -22,7 +22,7 @@
         type="info"
         :closable="false"
         show-icon
-        title="测试 / 生产的私钥与 Product 映射相互隔离。改映射后需点「保存」；调试不会自动写库。生产 create-session 需 Waffo 门店已 Go-Live。"
+        title="改映射后需点「保存」。调试只探测不写库。生产 create-session 需 Waffo 门店已 Go-Live。"
         style="margin-bottom: 16px"
       />
 
@@ -46,7 +46,7 @@
               {{ isLive ? 'live' : 'test' }}
             </el-tag>
           </div>
-          <div class="hint">切换前会暂存当前映射到对应环境；未配置私钥的环境需单独粘贴保存。</div>
+          <div class="hint">测试 / 生产私钥与 Product 映射隔离；未配私钥的环境需单独粘贴保存。</div>
         </el-form-item>
         <el-form-item label="商户 ID">
           <el-input v-model="waffo.merchant_id" placeholder="MER_…" />
@@ -76,10 +76,6 @@
             style="margin-top: 8px"
           />
         </el-form-item>
-        <el-form-item label="默认货币">
-          <el-input v-model="waffo.currency" style="width: 120px" placeholder="CNY" />
-          <div class="hint">映射表可按计划覆盖（包年 CNY / 永久 USD）</div>
-        </el-form-item>
         <el-form-item label="SUCCESS_URL">
           <el-input v-model="waffo.success_url" placeholder="支付成功回跳" />
         </el-form-item>
@@ -111,7 +107,7 @@
         type="warning"
         :closable="false"
         show-icon
-        title="调试按钮不会写库。改完映射请点右上角「保存配置」。生产与测试可点「填充 OpsXshell 商品」一键写入包年/永久 Product ID。"
+        title="下单时按计划选用对应 PROD_xxx：包年→yearly，永久→perpetual。货币由后端按计划自动带（包年 CNY / 永久 USD），无需手填。"
         style="margin-bottom: 12px"
       />
       <el-table :data="productMappings" border stripe>
@@ -129,24 +125,16 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column label="说明" min-width="120">
+        <el-table-column label="说明" min-width="140">
           <template #default="{ row }">
             <el-input v-model="row.label" placeholder="可选" />
           </template>
         </el-table-column>
-        <el-table-column label="Waffo Product ID" min-width="240">
+        <el-table-column label="Waffo Product ID" min-width="280">
           <template #default="{ row }">
             <el-input v-model="row.product_id" placeholder="PROD_…" />
           </template>
         </el-table-column>
-        <el-table-column label="货币" width="110">
-          <template #default="{ row }">
-            <el-select v-model="row.currency" allow-create filterable placeholder="CNY" style="width: 100%">
-              <el-option label="CNY" value="CNY" />
-              <el-option label="USD" value="USD" />
-            </el-select>
-          </template>
-        </el-table-column>
         <el-table-column label="操作" width="90" fixed="right">
           <template #default="{ $index }">
             <el-button size="small" type="danger" link @click="removeMapping($index)">删除</el-button>
@@ -169,19 +157,17 @@ import { getWaffoSettings, updateWaffoSettings, testWaffoConnection } from '@/ap
 
 const planKeyOptions = ['trial', 'yearly', 'perpetual', 'monthly', 'lifetime']
 
-// OpsXshell 线上商品（pancake 购买链接对应） // Logan.Li
+// OpsXshell 线上商品（与 pancake 购买链接一致） // Logan.Li
 const OPSXSHELL_PRODUCTS = [
   {
     plan_key: 'yearly',
     label: 'OpsXshell Yearly',
     product_id: 'PROD_5PqVJyEiCM4nDgVoA0RKjN',
-    currency: 'CNY',
   },
   {
     plan_key: 'perpetual',
     label: 'OpsXshell Perpetual',
     product_id: 'PROD_3BSJqDRkVBoYNgO78NsTAU',
-    currency: 'USD',
   },
 ]
 
@@ -217,8 +203,8 @@ const isLive = computed(() => waffo.environment === 'live')
 
 function defaultMappings() {
   return [
-    { plan_key: 'yearly', label: '包年', product_id: '', currency: 'CNY' },
-    { plan_key: 'perpetual', label: '永久', product_id: '', currency: 'USD' },
+    { plan_key: 'yearly', label: '包年', product_id: '' },
+    { plan_key: 'perpetual', label: '永久', product_id: '' },
   ]
 }
 
@@ -228,30 +214,24 @@ function normalizeMappings(data = {}) {
       plan_key: m.plan_key || m.key || m.plan_type || '',
       label: m.label || '',
       product_id: m.product_id || '',
-      currency: (m.currency || '').toUpperCase() || guessCurrency(m.plan_key),
     }))
   }
   const rows = []
   if (data.product_id_yearly) {
-    rows.push({
-      plan_key: 'yearly',
-      label: '包年',
-      product_id: data.product_id_yearly,
-      currency: 'CNY',
-    })
+    rows.push({ plan_key: 'yearly', label: '包年', product_id: data.product_id_yearly })
   }
   if (data.product_id_perpetual || data.product_id) {
     rows.push({
       plan_key: 'perpetual',
       label: '永久',
       product_id: data.product_id_perpetual || data.product_id,
-      currency: 'USD',
     })
   }
   return rows.length ? rows : defaultMappings()
 }
 
-function guessCurrency(planKey) {
+// 按计划自动带货币，不再展示币种列 // Logan.Li
+function currencyForKey(planKey) {
   const k = (planKey || '').toLowerCase()
   if (k === 'perpetual' || k === 'lifetime') return 'USD'
   return 'CNY'
@@ -259,12 +239,10 @@ function guessCurrency(planKey) {
 
 function mappingsToCompatFields(rows) {
   const map = {}
-  const currencyMap = {}
   for (const row of rows) {
     const key = (row.plan_key || '').trim()
     if (!key) continue
     map[key] = (row.product_id || '').trim()
-    currencyMap[key] = (row.currency || '').trim().toUpperCase()
   }
   return {
     product_mappings: rows
@@ -273,13 +251,13 @@ function mappingsToCompatFields(rows) {
         plan_key: r.plan_key.trim(),
         label: r.label || '',
         product_id: (r.product_id || '').trim(),
-        currency: (r.currency || '').trim().toUpperCase(),
+        currency: currencyForKey(r.plan_key),
       })),
     product_id_yearly: map.yearly || '',
     product_id_perpetual: map.perpetual || map.lifetime || '',
     product_id: map.perpetual || map.lifetime || map.yearly || '',
-    currency_yearly: currencyMap.yearly || '',
-    currency_perpetual: currencyMap.perpetual || currencyMap.lifetime || '',
+    currency_yearly: 'CNY',
+    currency_perpetual: 'USD',
   }
 }
 
@@ -307,14 +285,13 @@ function onEnvSwitch(live) {
   const next = live ? 'live' : 'test'
   const prev = waffo.environment === 'live' ? 'live' : 'test'
   if (next === prev) return
-  // 必须先把当前表写入「切换前」环境，再加载目标环境（勿用会提前改 environment 的 v-model） // Logan.Li
   stashEnv(prev)
   applyEnv(next)
   ElMessage.info(live ? '已切换到生产映射（记得保存）' : '已切换到测试映射（记得保存）')
 }
 
 function addMapping() {
-  productMappings.value.push({ plan_key: '', label: '', product_id: '', currency: 'CNY' })
+  productMappings.value.push({ plan_key: '', label: '', product_id: '' })
 }
 
 function removeMapping(index) {
@@ -328,12 +305,10 @@ function fillOpsxshellProducts() {
     if (byKey[item.plan_key]) {
       byKey[item.plan_key].product_id = item.product_id
       byKey[item.plan_key].label = item.label
-      byKey[item.plan_key].currency = item.currency
     } else {
       productMappings.value.push({ ...item })
     }
   }
-  // 保证 yearly / perpetual 在前 // Logan.Li
   const order = ['yearly', 'perpetual']
   productMappings.value.sort((a, b) => {
     const ia = order.indexOf(a.plan_key)
@@ -397,7 +372,7 @@ async function save() {
       store_id: waffo.store_id,
       store_slug: waffo.store_slug,
       environment: waffo.environment,
-      currency: waffo.currency,
+      currency: waffo.currency || 'CNY',
       success_url: waffo.success_url,
       clear_private_key: clearKeyFlag.value,
       ...compat,