From 8c6c122dc2b529064057eade2e3cc94509d7353b Mon Sep 17 00:00:00 2001
From: zhenhui <1276357500@qq.com>
Date: Thu, 4 Jun 2026 12:29:23 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E9=BB=98=E8=AE=A4=E5=BD=A9?=
 =?UTF-8?q?=E9=87=91=E6=B1=A0=E9=85=8D=E7=BD=AE=202.=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=BD=A9=E9=87=91=E6=B1=A0=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=9A=84=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA=203.=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E4=B8=80=E9=94=AE=E6=B5=8B=E8=AF=95=E6=9D=83=E9=87=8D?=
 =?UTF-8?q?=204.=E4=BC=98=E5=8C=96=E5=BA=95=E6=B3=A8=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dice/api/lottery_pool_config/index.ts     | 25 +++++-----
 .../src/views/plugin/dice/api/player/index.ts |  4 +-
 .../dice/player/index/modules/edit-dialog.vue | 39 +++++++++++----
 .../player/index/modules/table-search.vue     |  4 +-
 .../index/modules/weight-test-dialog.vue      | 47 +++----------------
 .../index/modules/detail-drawer.vue           |  4 +-
 6 files changed, 58 insertions(+), 65 deletions(-)

diff --git a/saiadmin-artd/src/views/plugin/dice/api/lottery_pool_config/index.ts b/saiadmin-artd/src/views/plugin/dice/api/lottery_pool_config/index.ts
index b862b27..c0f2695 100644
--- a/saiadmin-artd/src/views/plugin/dice/api/lottery_pool_config/index.ts
+++ b/saiadmin-artd/src/views/plugin/dice/api/lottery_pool_config/index.ts
@@ -12,6 +12,19 @@ export type LotteryPoolConfigOption = LotteryPoolOption & {
   t5_weight: number
 }
 
+/** 规范化接口返回的彩金池配置（含权重） */
+export function parseLotteryPoolConfigOption(raw: Record<string, unknown>): LotteryPoolConfigOption {
+  const base = normalizeLotteryPoolOption(raw)
+  return {
+    ...base,
+    t1_weight: Number(raw.t1_weight ?? 0),
+    t2_weight: Number(raw.t2_weight ?? 0),
+    t3_weight: Number(raw.t3_weight ?? 0),
+    t4_weight: Number(raw.t4_weight ?? 0),
+    t5_weight: Number(raw.t5_weight ?? 0)
+  }
+}
+
 /**
  * 色子奖池配置 API 接口
  */
@@ -39,17 +52,7 @@ export default {
     })
     const rows = Array.isArray(res) ? res : (Array.isArray((res as any)?.data) ? (res as any).data : [])
     if (!Array.isArray(rows)) return []
-    return rows.map((r: Record<string, unknown>) => {
-      const base = normalizeLotteryPoolOption(r)
-      return {
-        ...base,
-        t1_weight: Number(r.t1_weight ?? 0),
-        t2_weight: Number(r.t2_weight ?? 0),
-        t3_weight: Number(r.t3_weight ?? 0),
-        t4_weight: Number(r.t4_weight ?? 0),
-        t5_weight: Number(r.t5_weight ?? 0)
-      }
-    })
+    return rows.map((r: Record<string, unknown>) => parseLotteryPoolConfigOption(r))
   },
 
   /**
diff --git a/saiadmin-artd/src/views/plugin/dice/api/player/index.ts b/saiadmin-artd/src/views/plugin/dice/api/player/index.ts
index 702246e..723b6ac 100644
--- a/saiadmin-artd/src/views/plugin/dice/api/player/index.ts
+++ b/saiadmin-artd/src/views/plugin/dice/api/player/index.ts
@@ -1,5 +1,5 @@
 import request from '@/utils/http'
-import { normalizeLotteryPoolOption } from '@/views/plugin/dice/utils/lotteryPoolDisplay'
+import { normalizeLotteryPoolOption, type LotteryPoolOption } from '@/views/plugin/dice/utils/lotteryPoolDisplay'
 
 /**
  * 大富翁-玩家 API接口
@@ -87,7 +87,7 @@ export default {
   /**
    * 获取彩金池配置选项，供 lottery_config_id 下拉使用（含奖池名称 display_name）
    */
-  async getLotteryConfigOptions(params?: Record<string, unknown>) {
+  async getLotteryConfigOptions(params?: Record<string, unknown>): Promise<LotteryPoolOption[]> {
     const res = await request.get<any>({
       url: '/core/dice/player/DicePlayer/getLotteryConfigOptions',
       params
diff --git a/saiadmin-artd/src/views/plugin/dice/player/index/modules/edit-dialog.vue b/saiadmin-artd/src/views/plugin/dice/player/index/modules/edit-dialog.vue
index b64127a..a0553f1 100644
--- a/saiadmin-artd/src/views/plugin/dice/player/index/modules/edit-dialog.vue
+++ b/saiadmin-artd/src/views/plugin/dice/player/index/modules/edit-dialog.vue
@@ -183,9 +183,16 @@
 
 <script setup lang="ts">
   import api from '../../../api/player/index'
-  import lotteryConfigApi from '../../../api/lottery_pool_config/index'
+  import lotteryConfigApi, {
+    parseLotteryPoolConfigOption,
+    type LotteryPoolConfigOption
+  } from '../../../api/lottery_pool_config/index'
   import { useI18n } from 'vue-i18n'
-  import { lotteryPoolDisplayLabel, lotteryPoolOptionLabel } from '@/views/plugin/dice/utils/lotteryPoolDisplay'
+  import {
+    lotteryPoolDisplayLabel,
+    lotteryPoolOptionLabel,
+    type LotteryPoolOption
+  } from '@/views/plugin/dice/utils/lotteryPoolDisplay'
   import { getChannelDeptRequestParams, withChannelDeptParams } from '@/composables/useChannelDeptScope'
   import { isSuperAdminUser } from '@/utils/channelLayout'
   import { ElMessage } from 'element-plus'
@@ -273,7 +280,7 @@
   const formData = reactive({ ...initialFormData })
 
   /** 彩金池配置下拉选项（DiceLotteryConfig id、name） */
-  const lotteryConfigOptions = ref<Array<{ id: number; name: string }>>([])
+  const lotteryConfigOptions = ref<LotteryPoolOption[]>([])
   /** 彩金池选项加载中 */
   const lotteryConfigLoading = ref(false)
   /** 后台管理员下拉选项（SystemUser） */
@@ -299,7 +306,21 @@
   /** 管理员选项加载中 */
   const systemUserOptionsLoading = ref(false)
   /** 当前选中的 DiceLotteryConfig 完整数据（用于展示） */
-  const currentLotteryConfig = ref<Record<string, any> | null>(null)
+  const currentLotteryConfig = ref<LotteryPoolConfigOption | null>(null)
+
+  function isRecord(value: unknown): value is Record<string, unknown> {
+    return value !== null && typeof value === 'object'
+  }
+
+  function extractReadPayload(res: unknown): Record<string, unknown> | null {
+    if (!isRecord(res)) {
+      return null
+    }
+    if (isRecord(res.data)) {
+      return res.data
+    }
+    return res
+  }
 
   function lotteryConfigTypeText(name: unknown): string {
     const n = String(name ?? '')
@@ -324,8 +345,9 @@
     }
     try {
       const res = await lotteryConfigApi.read(id)
-      const row = (res as any)?.data ?? (res as any)
-      if (row && typeof row === 'object') {
+      const payload = extractReadPayload(res)
+      if (payload) {
+        const row = parseLotteryPoolConfigOption(payload)
         currentLotteryConfig.value = row
         WEIGHT_FIELDS.forEach((key) => {
           ;(formData as any)[key] = Number(row[key] ?? 0)
@@ -353,8 +375,9 @@
     }
     try {
       const res = await lotteryConfigApi.read(lotteryConfigId)
-      const row = (res as any)?.data ?? (res as any)
-      if (row && typeof row === 'object') {
+      const payload = extractReadPayload(res)
+      if (payload) {
+        const row = parseLotteryPoolConfigOption(payload)
         WEIGHT_FIELDS.forEach((key) => {
           ;(formData as any)[key] = Number(row[key] ?? 0)
         })
diff --git a/saiadmin-artd/src/views/plugin/dice/player/index/modules/table-search.vue b/saiadmin-artd/src/views/plugin/dice/player/index/modules/table-search.vue
index 298f3b3..aa76b9d 100644
--- a/saiadmin-artd/src/views/plugin/dice/player/index/modules/table-search.vue
+++ b/saiadmin-artd/src/views/plugin/dice/player/index/modules/table-search.vue
@@ -65,7 +65,7 @@
 
 <script setup lang="ts">
   import api from '../../../api/player/index'
-  import { lotteryPoolOptionLabel } from '@/views/plugin/dice/utils/lotteryPoolDisplay'
+  import { lotteryPoolOptionLabel, type LotteryPoolOption } from '@/views/plugin/dice/utils/lotteryPoolDisplay'
 
   interface Props {
     modelValue: Record<string, any>
@@ -78,7 +78,7 @@
   const props = defineProps<Props>()
   const emit = defineEmits<Emits>()
   const isExpanded = ref<boolean>(false)
-  const lotteryConfigOptions = ref<Array<{ id: number; name: string }>>([])
+  const lotteryConfigOptions = ref<LotteryPoolOption[]>([])
 
   /** 从玩家控制器获取 DiceLotteryPoolConfig id/name 列表，用于 lottery_config_id 筛选 */
   onMounted(async () => {
diff --git a/saiadmin-artd/src/views/plugin/dice/reward/index/modules/weight-test-dialog.vue b/saiadmin-artd/src/views/plugin/dice/reward/index/modules/weight-test-dialog.vue
index f4ab2ac..8ef94bf 100644
--- a/saiadmin-artd/src/views/plugin/dice/reward/index/modules/weight-test-dialog.vue
+++ b/saiadmin-artd/src/views/plugin/dice/reward/index/modules/weight-test-dialog.vue
@@ -226,7 +226,7 @@
 <script setup lang="ts">
   import api from '../../../api/reward/index'
   import anteConfigApi from '../../../api/ante_config/index'
-  import lotteryPoolApi from '../../../api/lottery_pool_config/index'
+  import lotteryPoolApi, { type LotteryPoolConfigOption } from '../../../api/lottery_pool_config/index'
   import { ElMessage } from 'element-plus'
   import { useI18n } from 'vue-i18n'
   import {
@@ -272,18 +272,7 @@
     kill_mode_enabled: false,
     test_safety_line: 0
   })
-  type LotteryPoolOption = {
-    id: number
-    name: string
-    remark?: string
-    display_name?: string
-    t1_weight?: number
-    t2_weight?: number
-    t3_weight?: number
-    t4_weight?: number
-    t5_weight?: number
-  }
-  const lotteryOptions = ref<LotteryPoolOption[]>([])
+  const lotteryOptions = ref<LotteryPoolConfigOption[]>([])
   const selectedPaidPool = computed(() =>
     lotteryOptions.value.find((r) => r.id === form.paid_lottery_config_id) ?? null
   )
@@ -355,9 +344,9 @@
     return label ? `${label} (×${item.mult})` : `×${item.mult}`
   }
 
-  function poolTierWeightsText(pool: LotteryPoolOption): string {
+  function poolTierWeightsText(pool: LotteryPoolConfigOption): string {
     const parts = tierKeys.map((t) => {
-      const key = `${t.toLowerCase()}_weight` as keyof LotteryPoolOption
+      const key = `${t.toLowerCase()}_weight` as keyof LotteryPoolConfigOption
       const v = pool[key]
       return `${t} ${v ?? 0}%`
     })
@@ -407,31 +396,9 @@
   async function loadLotteryOptions() {
     try {
       const list = await lotteryPoolApi.getOptions(resolveDeptParams())
-      lotteryOptions.value = list.map(
-        (r: {
-          id: number
-          name: string
-          remark?: string
-          display_name?: string
-          t1_weight?: number
-          t2_weight?: number
-          t3_weight?: number
-          t4_weight?: number
-          t5_weight?: number
-        }) => ({
-          id: r.id,
-          name: r.name,
-          remark: r.remark,
-          display_name: r.display_name,
-          t1_weight: r.t1_weight,
-          t2_weight: r.t2_weight,
-          t3_weight: r.t3_weight,
-          t4_weight: r.t4_weight,
-          t5_weight: r.t5_weight
-        })
-      )
-      const playerDefault = list.find((r: { name?: string }) => r.name === 'playerDefault')
-      const normal = list.find((r: { name?: string }) => r.name === 'default')
+      lotteryOptions.value = list
+      const playerDefault = list.find((r) => r.name === 'playerDefault')
+      const normal = list.find((r) => r.name === 'default')
       if (playerDefault) {
         form.paid_lottery_config_id = playerDefault.id
       } else if (normal) {
diff --git a/saiadmin-artd/src/views/plugin/dice/reward_config_record/index/modules/detail-drawer.vue b/saiadmin-artd/src/views/plugin/dice/reward_config_record/index/modules/detail-drawer.vue
index 3d50dd2..69e882f 100644
--- a/saiadmin-artd/src/views/plugin/dice/reward_config_record/index/modules/detail-drawer.vue
+++ b/saiadmin-artd/src/views/plugin/dice/reward_config_record/index/modules/detail-drawer.vue
@@ -298,7 +298,7 @@
       return t('page.detail.killModeOff')
     }
     const line = record.test_safety_line
-    if (line === null || line === undefined || line === '') {
+    if (line === null || line === undefined) {
       return t('page.detail.dash')
     }
     return String(line)
@@ -307,7 +307,7 @@
   function formatAnteDetail(record: RecordRow | null): string {
     if (!record) return t('page.detail.dash')
     const ante = record.ante
-    if (ante === null || ante === undefined || ante === '') {
+    if (ante === null || ante === undefined) {
       return t('page.detail.dash')
     }
     const snap = record.tier_weights_snapshot