fix: 微信配置

src/views/dashboard/analysis/widget/ActiveWechatConfig.vue

@@ -8,7 +8,7 @@
           <ElTag v-else type="info" effect="plain" size="small">未配置</ElTag>
         </div>
         <div v-if="activeConfig" class="header-right">
-          <span class="creator-info">创建于 {{ formatDateTime(activeConfig.created_at) }}</span>
+          <span class="creator-info">更新于 {{ formatDateTime(activeConfig.updated_at) }}</span>
         </div>
       </div>
     </template>
@@ -61,6 +61,30 @@
           <div class="info-value">{{ activeConfig.is_active ? '已激活' : '未激活' }}</div>
         </div>
       </div>
+      <div class="info-card">
+        <div
+          class="info-icon"
+          style="background: linear-gradient(135deg, #fa709a 0%, #fee140 100%)"
+        >
+          <i class="el-icon">🔔</i>
+        </div>
+        <div class="info-content">
+          <div class="info-label">支付回调地址</div>
+          <div class="info-value">{{ getNotifyUrl(activeConfig) }}</div>
+        </div>
+      </div>
+      <div class="info-card">
+        <div
+          class="info-icon"
+          style="background: linear-gradient(135deg, #30cfd0 0%, #330867 100%)"
+        >
+          <i class="el-icon">🔐</i>
+        </div>
+        <div class="info-content">
+          <div class="info-label">凭证状态</div>
+          <div class="info-value">{{ getCredentialStatus(activeConfig) }}</div>
+        </div>
+      </div>
     </div>
     <div v-else class="empty-content">
       <i class="el-icon-info" style="font-size: 48px; color: var(--el-text-color-placeholder)"></i>
@@ -72,8 +96,14 @@
 <script setup lang="ts">
   import { WechatConfigService } from '@/api/modules'
   import { ElTag } from 'element-plus'
-  import type { WechatConfig, PaymentProviderType } from '@/types/api'
+  import type { WechatConfig } from '@/types/api'
   import { formatDateTime } from '@/utils/business/format'
+  import {
+    getPaymentConfigStatus,
+    getPaymentMerchantId,
+    getPaymentNotifyUrl,
+    getPaymentProviderText
+  } from '@/utils/business/paymentConfig'
   import { usePermission } from '@/composables/usePermission'
 
   defineOptions({ name: 'ActiveWechatConfigWidget' })
@@ -83,23 +113,43 @@
   // 当前生效的支付配置
   const activeConfig = ref<WechatConfig | null>(null)
 
-  // 获取支付渠道类型文本
-  const getProviderTypeText = (type: PaymentProviderType): string => {
-    const typeMap: Record<PaymentProviderType, string> = {
-      wechat: '微信直连',
-      fuiou: '富友支付'
-    }
-    return typeMap[type] || type
+  const getProviderTypeText = (type: WechatConfig['provider_type']): string => {
+    return getPaymentProviderText(type)
   }
 
-  // 获取商户号
   const getMerchantId = (config: WechatConfig): string => {
-    if (config.provider_type === 'wechat') {
-      return config.wx_mch_id || '-'
+    return getPaymentMerchantId(config)
+  }
+
+  const getNotifyUrl = (config: WechatConfig): string => {
+    return getPaymentNotifyUrl(config)
+  }
+
+  const getCredentialStatus = (config: WechatConfig): string => {
+    if (config.provider_type === 'wechat' || config.provider_type === 'wechat_v2') {
+      const certStatus = getPaymentConfigStatus(config.wx_cert_content)
+      const keyStatus = getPaymentConfigStatus(config.wx_key_content)
+      if (certStatus === '已配置' && keyStatus === '已配置') {
+        return '证书/密钥已配置'
+      }
+      if (certStatus === '未配置' && keyStatus === '未配置') {
+        return '未配置'
+      }
+      return '部分配置'
     }
+
     if (config.provider_type === 'fuiou') {
-      return config.fy_mchnt_cd || '-'
+      const privateKeyStatus = getPaymentConfigStatus(config.fy_private_key)
+      const publicKeyStatus = getPaymentConfigStatus(config.fy_public_key)
+      if (privateKeyStatus === '已配置' && publicKeyStatus === '已配置') {
+        return '富友密钥已配置'
+      }
+      if (privateKeyStatus === '未配置' && publicKeyStatus === '未配置') {
+        return '未配置'
+      }
+      return '部分配置'
     }
+
     return '-'
   }
 

src/views/settings/wechat-config/detail.vue

@@ -27,14 +27,14 @@
 <script setup lang="ts">
   import { ref, onMounted, computed } from 'vue'
   import { useRoute, useRouter } from 'vue-router'
-  import { ElCard, ElButton, ElIcon, ElMessage } from 'element-plus'
+  import { ElCard, ElButton, ElIcon } from 'element-plus'
   import { ArrowLeft, Loading } from '@element-plus/icons-vue'
   import DetailPage from '@/components/common/DetailPage.vue'
   import type { DetailSection } from '@/components/common/DetailPage.vue'
   import { WechatConfigService } from '@/api/modules'
-  import type { WechatConfig, PaymentProviderType } from '@/types/api'
+  import type { WechatConfig } from '@/types/api'
   import { formatDateTime } from '@/utils/business/format'
-  import { RoutesAlias } from '@/router/routesAlias'
+  import { getPaymentConfigStatus, getPaymentProviderText } from '@/utils/business/paymentConfig'
 
   defineOptions({ name: 'WechatConfigDetail' })
 
@@ -46,21 +46,9 @@
 
   const configId = computed(() => Number(route.params.id))
   const pageTitle = computed(() => `支付配置详情 #${configId.value}`)
-
-  // 获取支付渠道类型文本
-  const getProviderTypeText = (type: PaymentProviderType): string => {
-    const typeMap: Record<PaymentProviderType, string> = {
-      wechat: '微信直连',
-      wechat_v2: '微信直连V2',
-      fuiou: '富友支付'
-    }
-    return typeMap[type] || type
-  }
-
-  // 获取配置状态文本
-  const getConfigStatus = (value: string | undefined | null): string => {
-    if (!value) return '未配置'
-    return value === 'configured' ? '已配置' : value
+  const formatText = (value: string | number | undefined | null): string => {
+    if (value === undefined || value === null || value === '') return '-'
+    return String(value)
   }
 
   // 基础详情配置
@@ -71,7 +59,7 @@
       { label: '配置名称', prop: 'name' },
       {
         label: '支付渠道类型',
-        formatter: (_, data) => getProviderTypeText(data.provider_type)
+        formatter: (_, data) => getPaymentProviderText(data.provider_type)
       },
       {
         label: '激活状态',
@@ -103,12 +91,12 @@
       {
         label: '小程序AppID',
         prop: 'miniapp_app_id',
-        formatter: (value) => value || '-'
+        formatter: (value) => formatText(value)
       },
       {
         label: '小程序AppSecret',
         prop: 'miniapp_app_secret',
-        formatter: (value) => value || '-'
+        formatter: (value) => formatText(value)
       }
     ]
   }
@@ -120,32 +108,74 @@
       {
         label: '公众号AppID',
         prop: 'oa_app_id',
-        formatter: (value) => value || '-'
+        formatter: (value) => formatText(value)
       },
       {
         label: '公众号AppSecret',
         prop: 'oa_app_secret',
-        formatter: (value) => value || '-'
+        formatter: (value) => formatText(value)
       },
       {
         label: '公众号Token',
         prop: 'oa_token',
-        formatter: (value) => value || '-'
+        formatter: (value) => formatText(value)
       },
       {
         label: '公众号AES Key',
         prop: 'oa_aes_key',
-        formatter: (value) => value || '-'
+        formatter: (value) => formatText(value)
       },
       {
         label: 'OAuth回调地址',
         prop: 'oa_oauth_redirect_url',
-        formatter: (value) => value || '-',
+        formatter: (value) => formatText(value),
         fullWidth: true
       }
     ]
   }
 
+  const alipaySection: DetailSection = {
+    title: '支付宝配置',
+    fields: [
+      {
+        label: '支付宝AppID',
+        prop: 'ali_app_id',
+        formatter: (value) => formatText(value)
+      },
+      {
+        label: '支付过期分钟数',
+        prop: 'ali_pay_expire_minutes',
+        formatter: (value) => formatText(value)
+      },
+      {
+        label: '生产环境',
+        formatter: (_, data) => (data.ali_production ? '是' : '否')
+      },
+      {
+        label: '异步通知地址',
+        prop: 'ali_notify_url',
+        formatter: (value) => formatText(value),
+        fullWidth: true
+      },
+      {
+        label: '同步跳转地址',
+        prop: 'ali_return_url',
+        formatter: (value) => formatText(value),
+        fullWidth: true
+      },
+      {
+        label: '应用私钥',
+        prop: 'ali_private_key',
+        formatter: (value) => getPaymentConfigStatus(value)
+      },
+      {
+        label: '支付宝公钥',
+        prop: 'ali_public_key',
+        formatter: (value) => getPaymentConfigStatus(value)
+      }
+    ]
+  }
+
   // 微信配置
   const wechatPaySection: DetailSection = {
     title: '微信配置',
@@ -153,38 +183,38 @@
       {
         label: '微信商户号',
         prop: 'wx_mch_id',
-        formatter: (value) => value || '-'
+        formatter: (value) => formatText(value)
       },
       {
         label: '证书序列号',
         prop: 'wx_serial_no',
-        formatter: (value) => value || '-'
+        formatter: (value) => formatText(value)
       },
       {
         label: 'APIv2密钥',
         prop: 'wx_api_v2_key',
-        formatter: (value) => value || '-'
+        formatter: (value) => formatText(value)
       },
       {
         label: 'APIv3密钥',
         prop: 'wx_api_v3_key',
-        formatter: (value) => value || '-'
+        formatter: (value) => formatText(value)
       },
       {
         label: '支付回调地址',
         prop: 'wx_notify_url',
-        formatter: (value) => value || '-',
+        formatter: (value) => formatText(value),
         fullWidth: true
       },
       {
         label: '支付证书',
         prop: 'wx_cert_content',
-        formatter: (value) => getConfigStatus(value)
+        formatter: (value) => getPaymentConfigStatus(value)
       },
       {
         label: '支付密钥',
         prop: 'wx_key_content',
-        formatter: (value) => getConfigStatus(value)
+        formatter: (value) => getPaymentConfigStatus(value)
       }
     ]
   }
@@ -196,38 +226,38 @@
       {
         label: '富友API地址',
         prop: 'fy_api_url',
-        formatter: (value) => value || '-',
+        formatter: (value) => formatText(value),
         fullWidth: true
       },
       {
         label: '富友机构号',
         prop: 'fy_ins_cd',
-        formatter: (value) => value || '-'
+        formatter: (value) => formatText(value)
       },
       {
         label: '富友商户号',
         prop: 'fy_mchnt_cd',
-        formatter: (value) => value || '-'
+        formatter: (value) => formatText(value)
       },
       {
         label: '富友终端号',
         prop: 'fy_term_id',
-        formatter: (value) => value || '-'
+        formatter: (value) => formatText(value)
       },
       {
         label: '支付回调地址',
         prop: 'fy_notify_url',
-        formatter: (value) => value || '-'
+        formatter: (value) => formatText(value)
       },
       {
         label: '富友私钥',
         prop: 'fy_private_key',
-        formatter: (value) => getConfigStatus(value)
+        formatter: (value) => getPaymentConfigStatus(value)
       },
       {
         label: '富友公钥',
         prop: 'fy_public_key',
-        formatter: (value) => getConfigStatus(value)
+        formatter: (value) => getPaymentConfigStatus(value)
       }
     ]
   }
@@ -236,10 +266,13 @@
   const detailSections = computed<DetailSection[]>(() => {
     if (!detailData.value) return [baseSection]
 
-    const sections = [baseSection]
+    const sections = [baseSection, miniappSection, oaSection, alipaySection]
 
-    if (detailData.value.provider_type === 'wechat') {
-      sections.push(miniappSection, oaSection, wechatPaySection)
+    if (
+      detailData.value.provider_type === 'wechat' ||
+      detailData.value.provider_type === 'wechat_v2'
+    ) {
+      sections.push(wechatPaySection)
     } else if (detailData.value.provider_type === 'fuiou') {
       sections.push(fuiouSection)
     }