优化抽奖方式，以及记录相关信息

saiadmin-artd/src/locales/langs/en.json

@@ -361,6 +361,7 @@
     "dice": {
       "title": "Dice Game",
       "lotteryPoolConfig": "Lottery Tier Weight Config",
+      "anteConfig": "Ante Config",
       "player": "Player Management",
       "playerWalletRecord": "Player Wallet Records",
       "playRecord": "Player Draw Records",

saiadmin-artd/src/locales/langs/en/dice/play_record.json

@@ -30,8 +30,8 @@
     "rollArrayHint": "5 numbers, each 1–6",
     "rollNumber": "Roll Sum",
     "placeholderRollNumber": "Sum of 5 dice (5–30)",
-    "rewardConfig": "Reward Config",
+    "rewardTier": "Reward Tier",
-    "placeholderRewardConfig": "Select reward config (by UI text)",
+    "placeholderRewardTier": "Select reward tier",
     "addSuccess": "Added successfully",
     "editSuccess": "Updated successfully",
     "validateFailed": "Validation failed, please check required fields and format"
@@ -47,8 +47,8 @@
     "direction": "Direction",
     "winCoin": "Win Coin",
     "rollNumber": "Roll Number",
-    "rewardConfig": "Reward Config",
     "rewardTier": "Reward Tier",
+    "rewardConfig": "Reward Config",
     "usernameFuzzy": "Username (fuzzy)",
     "nameFuzzy": "Name (fuzzy)",
     "uiTextFuzzy": "UI Text (fuzzy)",
@@ -75,7 +75,7 @@
     "targetIndex": "Target Index",
     "rollArray": "Roll Array",
     "rollNumber": "Roll Number",
-    "rewardConfig": "Reward Config",
+    "rewardTier": "Reward Tier",
     "createTime": "Create Time",
     "updateTime": "Update Time"
   }

saiadmin-artd/src/locales/langs/en/dice/play_record_test.json

@@ -37,7 +37,8 @@
     "targetIndex": "Target Index",
     "rollArray": "Roll Array",
     "rollNumber": "Roll Number",
-    "rewardConfig": "Reward Config",
+    "rewardTier": "Reward Tier",
+    "status": "Status",
     "createTime": "Create Time"
   },
   "form": {
@@ -46,9 +47,7 @@
     "labelLotteryConfigId": "Lottery Config ID",
     "placeholderLotteryConfigId": "Please enter lottery config id",
     "placeholderWinCoin": "Win coin",
-    "placeholderRewardTier": "Please select tier (will auto fill reward config id)",
+    "placeholderRewardTier": "Please select reward tier",
-    "rewardConfigId": "Reward Config ID",
-    "placeholderRewardConfigId": "Auto fill by tier or enter manually",
     "placeholderStartIndex": "Please enter start index",
     "labelTargetIndex": "Target Index",
     "placeholderTargetIndex": "Please enter target index",
@@ -64,7 +63,7 @@
     "ruleDrawTypeRequired": "Draw type is required",
     "ruleIsBigWinRequired": "Is big win is required",
     "ruleDirectionRequired": "Direction is required",
-    "ruleRewardConfigIdRequired": "Reward config id is required",
+    "ruleRewardTierRequired": "Reward tier is required",
     "ruleStatusRequired": "Status is required",
     "addSuccess": "Added successfully",
     "editSuccess": "Updated successfully"

saiadmin-artd/src/locales/langs/en/dice/player.json

@@ -66,6 +66,7 @@
     "status": "Status",
     "coin": "Coin",
     "lotteryPoolConfig": "Lottery Pool Config",
+    "customConfig": "Custom",
     "t1Weight": "T1 Weight",
     "t2Weight": "T2 Weight",
     "t3Weight": "T3 Weight",

saiadmin-artd/src/locales/langs/zh.json

@@ -357,6 +357,7 @@
     "dice": {
       "title": "大富翁-色子游戏",
       "lotteryPoolConfig": "彩金池配置",
+      "anteConfig": "底注配置",
       "player": "玩家管理",
       "playerWalletRecord": "玩家钱包记录",
       "playRecord": "玩家抽奖记录",

saiadmin-artd/src/locales/langs/zh/dice/play_record.json

@@ -30,8 +30,8 @@
     "rollArrayHint": "固定 5 个数，每个 1～6",
     "rollNumber": "摇取点数和",
     "placeholderRollNumber": "5 个色子点数之和（5～30）",
-    "rewardConfig": "奖励配置",
+    "rewardTier": "中奖档位",
-    "placeholderRewardConfig": "请选择奖励配置（显示前端文本）",
+    "placeholderRewardTier": "请选择中奖档位",
     "addSuccess": "新增成功",
     "editSuccess": "修改成功",
     "validateFailed": "表单验证失败，请检查必填项与格式"
@@ -47,8 +47,8 @@
     "direction": "方向",
     "winCoin": "赢取平台币",
     "rollNumber": "摇取点数和",
+    "rewardTier": "中奖档位",
     "rewardConfig": "奖励配置",
-    "rewardTier": "奖励档位",
     "usernameFuzzy": "用户名模糊",
     "nameFuzzy": "名称模糊",
     "uiTextFuzzy": "前端显示文本模糊",
@@ -75,7 +75,7 @@
     "targetIndex": "终点索引",
     "rollArray": "摇取点数",
     "rollNumber": "摇取点数和",
-    "rewardConfig": "奖励配置",
+    "rewardTier": "中奖档位",
     "createTime": "创建时间",
     "updateTime": "更新时间"
   }

saiadmin-artd/src/locales/langs/zh/dice/play_record_test.json

@@ -11,7 +11,7 @@
     "winCoin": "赢取平台币",
     "paidAmount": "付费金额",
     "ante": "底注",
-    "rewardTier": "奖励档位",
+    "rewardTier": "中奖档位",
     "rollNumber": "摇取点数和",
     "paid": "付费",
     "free": "免费",
@@ -37,7 +37,8 @@
     "targetIndex": "终点索引",
     "rollArray": "摇取点数",
     "rollNumber": "摇取点数和",
-    "rewardConfig": "奖励配置",
+    "rewardTier": "中奖档位",
+    "status": "状态",
     "createTime": "创建时间"
   },
   "form": {
@@ -46,9 +47,7 @@
     "labelLotteryConfigId": "彩金池配置id",
     "placeholderLotteryConfigId": "请输入彩金池配置id",
     "placeholderWinCoin": "赢取平台币",
-    "placeholderRewardTier": "请选择档位(选后自动带出奖励配置ID)",
+    "placeholderRewardTier": "请选择中奖档位",
-    "rewardConfigId": "奖励配置id",
-    "placeholderRewardConfigId": "可选中奖档位自动带出或手动输入",
     "placeholderStartIndex": "请输入起始索引",
     "labelTargetIndex": "结束索引",
     "placeholderTargetIndex": "请输入结束索引",
@@ -64,7 +63,7 @@
     "ruleDrawTypeRequired": "抽奖类型必需填写",
     "ruleIsBigWinRequired": "是否中大奖必需填写",
     "ruleDirectionRequired": "方向必需填写",
-    "ruleRewardConfigIdRequired": "奖励配置id必需填写",
+    "ruleRewardTierRequired": "中奖档位必需填写",
     "ruleStatusRequired": "状态必需填写",
     "addSuccess": "新增成功",
     "editSuccess": "修改成功"

saiadmin-artd/src/locales/langs/zh/dice/player.json

@@ -66,6 +66,7 @@
     "status": "状态",
     "coin": "平台币",
     "lotteryPoolConfig": "彩金池配置",
+    "customConfig": "自定义",
     "t1Weight": "T1权重",
     "t2Weight": "T2权重",
     "t3Weight": "T3权重",

saiadmin-artd/src/utils/router.ts

@@ -42,6 +42,8 @@ export const MAP_PATH_TO_MENU_I18N_KEY: Record<string, string> = {
   '/dice': 'menus.dice.title',
   '/dice/lottery_pool_config': 'menus.dice.lotteryPoolConfig',
   '/dice/lottery_pool_config/index': 'menus.dice.lotteryPoolConfig',
+  '/dice/ante_config': 'menus.dice.anteConfig',
+  '/dice/ante_config/index': 'menus.dice.anteConfig',
   '/dice/player': 'menus.dice.player',
   '/dice/player/index': 'menus.dice.player',
   '/dice/player_wallet_record': 'menus.dice.playerWalletRecord',

saiadmin-artd/src/views/plugin/dice/api/play_record/index.ts

@@ -75,12 +75,5 @@ export default {
     return request.get<{ id: number; name: string }[]>({
       url: '/dice/play_record/DicePlayRecord/getLotteryConfigOptions'
     })
-  },
-
-  /** 获取奖励配置选项（id、ui_text、tier） */
-  getRewardConfigOptions() {
-    return request.get<{ id: number; ui_text: string; tier: string }[]>({
-      url: '/dice/play_record/DicePlayRecord/getRewardConfigOptions'
-    })
   }
 }

saiadmin-artd/src/views/plugin/dice/play_record/index/index.vue

@@ -56,19 +56,37 @@
         <!-- 抽奖类型 tag -->
         <template #lottery_type="{ row }">
           <ElTag size="small" :type="row.lottery_type === 0 ? 'warning' : 'success'">
-            {{ row.lottery_type === 0 ? t('page.search.paid') : row.lottery_type === 1 ? t('page.search.free') : '-' }}
+            {{
+              row.lottery_type === 0
+                ? t('page.search.paid')
+                : row.lottery_type === 1
+                  ? t('page.search.free')
+                  : '-'
+            }}
           </ElTag>
         </template>
         <!-- 是否中大奖 tag -->
         <template #is_win="{ row }">
           <ElTag size="small" :type="row.is_win === 1 ? 'success' : 'info'">
-            {{ row.is_win === 0 ? t('page.search.noBigWin') : row.is_win === 1 ? t('page.search.bigWin') : '-' }}
+            {{
+              row.is_win === 0
+                ? t('page.search.noBigWin')
+                : row.is_win === 1
+                  ? t('page.search.bigWin')
+                  : '-'
+            }}
           </ElTag>
         </template>
         <!-- 方向 tag -->
         <template #direction="{ row }">
           <ElTag size="small" :type="row.direction === 0 ? 'primary' : 'warning'">
-            {{ row.direction === 0 ? t('page.search.clockwise') : row.direction === 1 ? t('page.search.anticlockwise') : '-' }}
+            {{
+              row.direction === 0
+                ? t('page.search.clockwise')
+                : row.direction === 1
+                  ? t('page.search.anticlockwise')
+                  : '-'
+            }}
           </ElTag>
         </template>
         <!-- 平台币相关：统一整数显示 -->
@@ -158,8 +176,7 @@
     row?.dicePlayer?.username ?? row?.player_id ?? '-'
   const lotteryConfigNameFormatter = (row: Record<string, any>) =>
     row?.diceLotteryPoolConfig?.name ?? row?.lottery_config_id ?? '-'
-  const rewardTierFormatter = (row: Record<string, any>) =>
+  const rewardTierFormatter = (row: Record<string, any>) => row?.reward_tier ?? '-'
-    row?.diceRewardConfig?.tier ?? row?.reward_config_id ?? '-'
 
   /** 摇取点数格式化为 1,3,4,5,6,6 */
   function formatRollArray(val: unknown): string {
@@ -216,25 +233,32 @@
           useSlot: true
         },
         { prop: 'lottery_type', label: 'page.table.drawType', width: 100, useSlot: true },
+        { prop: 'direction', label: 'page.table.direction', width: 90, useSlot: true },
         { prop: 'ante', label: 'page.table.ante', width: 80, align: 'center' },
         { prop: 'paid_amount', label: 'page.table.paidAmount', width: 110, align: 'center' },
         { prop: 'is_win', label: 'page.table.isBigWin', width: 100, useSlot: true },
         { prop: 'win_coin', label: 'page.table.winCoin', width: 110, useSlot: true },
         { prop: 'super_win_coin', label: 'page.table.superWinCoin', width: 120, useSlot: true },
         { prop: 'reward_win_coin', label: 'page.table.rewardWinCoin', width: 140, useSlot: true },
-        { prop: 'direction', label: 'page.table.direction', width: 90, useSlot: true },
         { prop: 'start_index', label: 'page.table.startIndex', width: 90 },
         { prop: 'target_index', label: 'page.table.targetIndex', width: 90 },
         { prop: 'roll_array', label: 'page.table.rollArray', width: 140, useSlot: true },
         { prop: 'roll_number', label: 'page.table.rollNumber', width: 110, sortable: true },
         {
-          prop: 'reward_config_id',
+          prop: 'reward_tier',
-          label: 'page.table.rewardConfig',
+          label: 'page.table.rewardTier',
+          width: 100,
           formatter: (row: Record<string, any>) => rewardTierFormatter(row)
         },
         { prop: 'create_time', label: 'page.table.createTime', width: 170 },
         { prop: 'update_time', label: 'page.table.updateTime', width: 170 },
-        { prop: 'operation', label: 'table.actions.operation', width: 100, fixed: 'right', useSlot: true }
+        {
+          prop: 'operation',
+          label: 'table.actions.operation',
+          width: 100,
+          fixed: 'right',
+          useSlot: true
+        }
       ]
     }
   })

saiadmin-artd/src/views/plugin/dice/play_record/index/modules/edit-dialog.vue

@@ -153,25 +153,21 @@
           :disabled="dialogType === 'edit'"
         />
       </el-form-item>
-      <el-form-item :label="$t('page.form.rewardConfig')" prop="reward_config_id">
+      <el-form-item :label="$t('page.form.rewardTier')" prop="reward_tier">
         <el-select
-          v-model="formData.reward_config_id"
+          v-model="formData.reward_tier"
-          :placeholder="$t('page.form.placeholderRewardConfig')"
+          :placeholder="$t('page.form.placeholderRewardTier')"
           clearable
           filterable
           style="width: 100%"
-          :disabled="dialogType === 'edit'"
+          :disabled="true"
         >
-          <el-option
+          <el-option label="T1" value="T1" />
-            v-for="item in rewardConfigOptions"
+          <el-option label="T2" value="T2" />
-            :key="item.id"
+          <el-option label="T3" value="T3" />
-            :label="
+          <el-option label="T4" value="T4" />
-              item.ui_text
+          <el-option label="T5" value="T5" />
-                ? `${item.ui_text}${item.tier ? ' (' + item.tier + ')' : ''}`
+          <el-option label="BIGWIN" value="BIGWIN" />
-                : String(item.id)
-            "
-            :value="item.id"
-          />
         </el-select>
       </el-form-item>
     </el-form>
@@ -239,12 +235,11 @@
         trigger: 'change'
       }
     ],
-    reward_config_id: [{ required: true, message: '请选择奖励配置', trigger: 'change' }]
+    reward_tier: [{ required: true, message: '请选择中奖档位', trigger: 'change' }]
   })
 
   const playerOptions = ref<Array<{ id: number; username: string }>>([])
   const lotteryConfigOptions = ref<Array<{ id: number; name: string }>>([])
-  const rewardConfigOptions = ref<Array<{ id: number; ui_text: string; tier: string }>>([])
 
   const initialFormData = {
     id: null as number | null,
@@ -260,7 +255,7 @@
     target_index: null as number | null,
     roll_array: null as string | number[] | null,
     roll_number: null as number | null,
-    reward_config_id: null as number | null
+    reward_tier: '' as string
   }
 
   /** 摇取点数固定 5 位 [n0..n4]，每项 1～6 */
@@ -277,22 +272,17 @@
       if (open) {
         initPage()
         try {
-          const [players, lotteryConfigs, rewardConfigs] = await Promise.all([
+          const [players, lotteryConfigs] = await Promise.all([
             api.getPlayerOptions(),
-            api.getLotteryConfigOptions(),
+            api.getLotteryConfigOptions()
-            api.getRewardConfigOptions()
           ])
           playerOptions.value = Array.isArray(players) ? players : ((players as any)?.data ?? [])
           lotteryConfigOptions.value = Array.isArray(lotteryConfigs)
             ? lotteryConfigs
             : ((lotteryConfigs as any)?.data ?? [])
-          rewardConfigOptions.value = Array.isArray(rewardConfigs)
-            ? rewardConfigs
-            : ((rewardConfigs as any)?.data ?? [])
         } catch {
           playerOptions.value = []
           lotteryConfigOptions.value = []
-          rewardConfigOptions.value = []
         }
       }
     }
@@ -322,7 +312,7 @@
       'target_index',
       'roll_array',
       'roll_number',
-      'reward_config_id'
+      'reward_tier'
     ]
     keys.forEach((key) => {
       const val = props.data![key]

saiadmin-artd/src/views/plugin/dice/play_record/index/modules/table-search.vue

@@ -101,6 +101,7 @@
           <el-option label="T3" value="T3" />
           <el-option label="T4" value="T4" />
           <el-option label="T5" value="T5" />
+          <el-option label="BIGWIN" value="BIGWIN" />
         </el-select>
       </el-form-item>
     </el-col>

saiadmin-artd/src/views/plugin/dice/play_record_test/index/index.vue

@@ -8,7 +8,9 @@
       <ArtTableHeader v-model:columns="columnChecks" :loading="loading" @refresh="refreshData">
         <template #left>
           <span v-if="totalWinCoin !== null" class="table-summary-inline">
-            {{ $t('page.toolbar.platformTotalProfit') }}：<strong>{{ formatPlatformCoin(totalWinCoin) }}</strong>
+            {{ $t('page.toolbar.platformTotalProfit') }}：<strong>{{
+              formatPlatformCoin(totalWinCoin)
+            }}</strong>
           </span>
           <ElSpace wrap class="table-toolbar-buttons">
             <ElButton
@@ -97,8 +99,8 @@
             {{ formatRollArray(row.roll_array) }}
           </ElTag>
         </template>
-        <!-- 奖励档位：显示 DiceRewardConfig.tier -->
+        <!-- 奖励档位：优先显示记录自带 reward_tier -->
-        <template #reward_config_id="{ row }">
+        <template #reward_tier="{ row }">
           <ElTag size="small">{{ rewardTierFormatter(row) }}</ElTag>
         </template>
         <!-- 平台币相关：统一整数显示 -->
@@ -180,8 +182,7 @@
 
   const lotteryConfigNameFormatter = (row: Record<string, any>) =>
     row?.diceLotteryPoolConfig?.name ?? row?.lottery_config_id ?? '-'
-  const rewardTierFormatter = (row: Record<string, any>) =>
+  const rewardTierFormatter = (row: Record<string, any>) => row?.reward_tier ?? '-'
-    row?.diceRewardConfig?.tier ?? row?.reward_config_id ?? '-'
 
   /** 摇取点数格式化为 1,3,4,5,6 */
   function formatRollArray(val: unknown): string {
@@ -258,18 +259,18 @@
           useSlot: true
         },
         { prop: 'lottery_type', label: 'page.table.drawType', width: 100, useSlot: true },
+        { prop: 'direction', label: 'page.table.direction', width: 90, useSlot: true },
+        { prop: 'ante', label: 'page.table.ante', width: 90 },
         { prop: 'is_win', label: 'page.table.isBigWin', width: 100, useSlot: true },
         { prop: 'paid_amount', label: 'page.table.paidAmount', width: 130 },
-        { prop: 'ante', label: 'page.table.ante', width: 90 },
         { prop: 'win_coin', label: 'page.table.winCoin', width: 110, useSlot: true },
         { prop: 'super_win_coin', label: 'page.table.superWinCoin', width: 120, useSlot: true },
         { prop: 'reward_win_coin', label: 'page.table.rewardWinCoin', width: 140, useSlot: true },
-        { prop: 'direction', label: 'page.table.direction', width: 90, useSlot: true },
         { prop: 'start_index', label: 'page.table.startIndex', width: 90 },
         { prop: 'target_index', label: 'page.table.targetIndex', width: 90 },
         { prop: 'roll_array', label: 'page.table.rollArray', width: 140, useSlot: true },
         { prop: 'roll_number', label: 'page.table.rollNumber', width: 110, sortable: true },
-        { prop: 'reward_config_id', label: 'page.table.rewardConfig', width: 100, useSlot: true },
+        { prop: 'reward_tier', label: 'page.table.rewardTier', width: 100, useSlot: true },
         { prop: 'status', label: 'page.table.status', width: 80, useSlot: true },
         { prop: 'create_time', label: 'page.table.createTime', width: 170 },
         {

saiadmin-artd/src/views/plugin/dice/play_record_test/index/modules/edit-dialog.vue

@@ -67,21 +67,15 @@
           :placeholder="$t('page.form.placeholderRewardTier')"
           clearable
           style="width: 100%"
-          @change="onRewardTierChange"
         >
           <el-option label="T1" value="T1" />
           <el-option label="T2" value="T2" />
           <el-option label="T3" value="T3" />
           <el-option label="T4" value="T4" />
           <el-option label="T5" value="T5" />
+          <el-option label="BIGWIN" value="BIGWIN" />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('page.form.rewardConfigId')" prop="reward_config_id">
-        <el-input
-          v-model="formData.reward_config_id"
-          :placeholder="$t('page.form.placeholderRewardConfigId')"
-        />
-      </el-form-item>
       <el-form-item :label="$t('page.table.startIndex')" prop="start_index">
         <el-input v-model="formData.start_index" :placeholder="$t('page.form.placeholderStartIndex')" />
       </el-form-item>
@@ -128,7 +122,6 @@
 
 <script setup lang="ts">
   import api from '../../../api/play_record_test/index'
-  import rewardConfigApi from '../../../api/reward_config/index'
   import { ElMessage } from 'element-plus'
   import type { FormInstance, FormRules } from 'element-plus'
   import { useI18n } from 'vue-i18n'
@@ -171,7 +164,7 @@
     lottery_type: [{ required: true, message: t('page.form.ruleDrawTypeRequired'), trigger: 'blur' }],
     is_win: [{ required: true, message: t('page.form.ruleIsBigWinRequired'), trigger: 'blur' }],
     direction: [{ required: true, message: t('page.form.ruleDirectionRequired'), trigger: 'blur' }],
-    reward_config_id: [{ required: true, message: t('page.form.ruleRewardConfigIdRequired'), trigger: 'blur' }],
+    reward_tier: [{ required: true, message: t('page.form.ruleRewardTierRequired'), trigger: 'blur' }],
     status: [{ required: true, message: t('page.form.ruleStatusRequired'), trigger: 'blur' }]
   }))
 
@@ -188,7 +181,6 @@
     win_coin: 0,
     direction: null,
     reward_tier: undefined as string | undefined,
-    reward_config_id: null,
     start_index: null,
     target_index: null,
     roll_number: null,
@@ -242,7 +234,6 @@
   const initForm = () => {
     if (props.data) {
       for (const key in formData) {
-        if (key === 'reward_tier') continue
         if (props.data[key] != null && props.data[key] !== undefined) {
           ;(formData as Record<string, unknown>)[key] = props.data[key]
         }
@@ -253,30 +244,6 @@
     }
   }
 
-  /**
-   * 中奖档位变更：按档位拉取奖励配置并取第一条的 id 填入 reward_config_id
-   */
-  async function onRewardTierChange(tier: string) {
-    if (!tier) {
-      formData.reward_config_id = null
-      return
-    }
-    try {
-      const res = await rewardConfigApi.list({
-        saiType: 'all',
-        tier: tier
-      })
-      const list = res?.data
-      const first = Array.isArray(list) && list.length > 0 ? list[0] : undefined
-      if (first && first.id != null) {
-        formData.reward_config_id = first.id
-      } else {
-        formData.reward_config_id = null
-      }
-    } catch {
-      formData.reward_config_id = null
-    }
-  }
 
   /**
    * 关闭弹窗并重置表单
@@ -294,7 +261,6 @@
     try {
       await formRef.value.validate()
       const payload = { ...formData }
-      delete (payload as Record<string, unknown>).reward_tier
       if (props.dialogType === 'add') {
         await api.save(payload)
         ElMessage.success(t('page.form.addSuccess'))

saiadmin-artd/src/views/plugin/dice/play_record_test/index/modules/table-search.vue

@@ -95,6 +95,7 @@
           <el-option label="T3" value="T3" />
           <el-option label="T4" value="T4" />
           <el-option label="T5" value="T5" />
+          <el-option label="BIGWIN" value="BIGWIN" />
         </el-select>
       </el-form-item>
     </el-col>

saiadmin-artd/src/views/plugin/dice/player/index/index.vue

@@ -98,6 +98,7 @@
 </template>
 
 <script setup lang="ts">
+  import { useI18n } from 'vue-i18n'
   import { useTable } from '@/hooks/core/useTable'
   import { useSaiAdmin } from '@/composables/useSaiAdmin'
   import api from '../../api/player/index'
@@ -105,6 +106,8 @@
   import EditDialog from './modules/edit-dialog.vue'
   import WalletOperateDialog from './modules/WalletOperateDialog.vue'
 
+  const { t } = useI18n()
+
   // 搜索表单
   const searchForm = ref({
     username: undefined,
@@ -129,7 +132,8 @@
 
   // 根据 lottery_config_id 显示彩金池配置名称
   const lotteryConfigNameFormatter = (row: any) =>
-    row?.diceLotteryPoolConfig?.name ?? (row?.lottery_config_id ? `#${row.lottery_config_id}` : '未知')
+    row?.diceLotteryPoolConfig?.name ??
+    (row?.lottery_config_id ? `#${row.lottery_config_id}` : t('page.table.customConfig'))
 
   // 表格
   const {

saiadmin-artd/src/views/plugin/dice/reward_config/utils/generateIndexByRules.ts

@@ -271,9 +271,9 @@ export function generateTiers(input: GenerateTierInput): GenerateTierResult {
   return { ok: false, message: '在当前盘面与约束下未找到可行解，请调整 T1/T4/T5 固定条数或放宽 T2 下限后重试' }
 }
 
-/** 展示文案：100 + 真实结算（中英文相同）；T5 不使用 */
+/** 展示文案：直接使用真实结算值（中英文相同） */
-function uiTextFromRealEvPlus100(realEv: number): { ui_text: string; ui_text_en: string } {
+function uiTextFromRealEv(realEv: number): { ui_text: string; ui_text_en: string } {
-  const s = String(100 + realEv)
+  const s = String(realEv)
   return { ui_text: s, ui_text_en: s }
 }
 
@@ -315,32 +315,33 @@ export function buildRowsFromTiers(
     if (standards !== undefined) {
       if (tier === 'T1') {
         real_ev = standards.T1
-        const f = uiTextFromRealEvPlus100(real_ev)
+        const f = uiTextFromRealEv(real_ev)
         ui_text = f.ui_text
         ui_text_en = f.ui_text_en
         remark = '大奖格'
       } else if (tier === 'T2') {
         real_ev = standards.T2
-        const f = uiTextFromRealEvPlus100(real_ev)
+        const f = uiTextFromRealEv(real_ev)
         ui_text = f.ui_text
         ui_text_en = f.ui_text_en
         remark = standards.T2 <= 1 ? '完美回本' : '小赚'
       } else if (tier === 'T3') {
         real_ev = standards.T3
-        const f = uiTextFromRealEvPlus100(real_ev)
+        const f = uiTextFromRealEv(real_ev)
         ui_text = f.ui_text
         ui_text_en = f.ui_text_en
         remark = '抽水'
       } else if (tier === 'T4') {
         real_ev = standards.T4
-        const f = uiTextFromRealEvPlus100(real_ev)
+        const f = uiTextFromRealEv(real_ev)
         ui_text = f.ui_text
         ui_text_en = f.ui_text_en
         remark = '惩罚'
       } else {
         real_ev = standards.T5
-        ui_text = '再来一次'
+        const f = uiTextFromRealEv(real_ev)
-        ui_text_en = 'Once again'
+        ui_text = f.ui_text
+        ui_text_en = f.ui_text_en
         remark = '前端需要在播放一次动画(特殊)'
       }
     } else if (tier === 'T1') {
@@ -348,7 +349,7 @@ export function buildRowsFromTiers(
       if (real_ev >= 500) {
         real_ev = 498
       }
-      const f = uiTextFromRealEvPlus100(real_ev)
+      const f = uiTextFromRealEv(real_ev)
       ui_text = f.ui_text
       ui_text_en = f.ui_text_en
       remark = '大奖格'
@@ -363,26 +364,27 @@ export function buildRowsFromTiers(
         }
         remark = '小赚'
       }
-      const f = uiTextFromRealEvPlus100(real_ev)
+      const f = uiTextFromRealEv(real_ev)
       ui_text = f.ui_text
       ui_text_en = f.ui_text_en
     } else if (tier === 'T3') {
       real_ev = -72 - (id % 15)
-      const f = uiTextFromRealEvPlus100(real_ev)
+      const f = uiTextFromRealEv(real_ev)
       ui_text = f.ui_text
       ui_text_en = f.ui_text_en
       remark = '抽水'
     } else if (tier === 'T4') {
       t4Seq++
       real_ev = -101 - t4Seq * 15
-      const f = uiTextFromRealEvPlus100(real_ev)
+      const f = uiTextFromRealEv(real_ev)
       ui_text = f.ui_text
       ui_text_en = f.ui_text_en
       remark = '惩罚'
     } else {
       real_ev = 0
-      ui_text = '再来一次'
+      const f = uiTextFromRealEv(real_ev)
-      ui_text_en = 'Once again'
+      ui_text = f.ui_text
+      ui_text_en = f.ui_text_en
       remark = '前端需要在播放一次动画(特殊)'
     }
     rows.push({

server/app/api/controller/GameController.php

@@ -76,28 +76,28 @@ class GameController extends BaseController
      * header: token（由 TokenMiddleware 注入 request->player_id）
      * body: count = 1 | 5 | 10（1次/100coin, 5次/500coin, 10次/1000coin）
      */
-    public function buyLotteryTickets(Request $request): Response
+//    public function buyLotteryTickets(Request $request): Response
-    {
+//    {
-        $userId = (int) ($request->player_id ?? 0);
+//        $userId = (int) ($request->player_id ?? 0);
-        $count = (int) $request->post('count', 0);
+//        $count = (int) $request->post('count', 0);
-        if (!in_array($count, [1, 5, 10], true)) {
+//        if (!in_array($count, [1, 5, 10], true)) {
-            return $this->fail('Invalid lottery ticket purchase', ReturnCode::PARAMS_ERROR);
+//            return $this->fail('Invalid lottery ticket purchase', ReturnCode::PARAMS_ERROR);
-        }
+//        }
-
+//
-        try {
+//        try {
-            $logic = new GameLogic();
+//            $logic = new GameLogic();
-            $data = $logic->buyLotteryTickets($userId, $count);
+//            $data = $logic->buyLotteryTickets($userId, $count);
-            return $this->success($data);
+//            return $this->success($data);
-        } catch (ApiException $e) {
+//        } catch (ApiException $e) {
-            $msg = $e->getMessage();
+//            $msg = $e->getMessage();
-            if ($msg === '平台币不足') {
+//            if ($msg === '平台币不足') {
-                $player = DicePlayer::find($userId);
+//                $player = DicePlayer::find($userId);
-                $coin = $player ? (float) $player->coin : 0;
+//                $coin = $player ? (float) $player->coin : 0;
-                return $this->success(['coin' => $coin], $msg);
+//                return $this->success(['coin' => $coin], $msg);
-            }
+//            }
-            return $this->fail($msg, ReturnCode::BUSINESS_ERROR);
+//            return $this->fail($msg, ReturnCode::BUSINESS_ERROR);
-        }
+//        }
-    }
+//    }
 
     /**
      * 获取彩金池（中奖配置表）
@@ -194,10 +194,11 @@ class GameController extends BaseController
             $langLower = strtolower($lang);
             $isEn = $langLower === 'en' || str_starts_with($langLower, 'en-');
 
-            if (is_array($data) && array_key_exists('reward_config_id', $data)) {
+            if (is_array($data)) {
-                $rewardConfigId = (int) $data['reward_config_id'];
+                $rewardTier = array_key_exists('reward_tier', $data) ? (string) ($data['reward_tier'] ?? '') : '';
-                if ($rewardConfigId > 0) {
+                $targetIndex = array_key_exists('target_index', $data) ? (int) ($data['target_index'] ?? 0) : 0;
-                    $configRow = DiceRewardConfig::getCachedById($rewardConfigId);
+                if ($rewardTier !== 'BIGWIN' && $targetIndex > 0) {
+                    $configRow = DiceRewardConfig::getCachedById($targetIndex);
                     if ($configRow !== null) {
                         $uiText = '';
                         $uiTextEn = '';
@@ -247,9 +248,8 @@ class GameController extends BaseController
                     'win_coin'           => 0,
                     'super_win_coin'     => 0,
                     'reward_win_coin'    => 0,
-                    'use_coins'          => 0,
                     'direction'          => $direction,
-                    'reward_config_id'   => 0,
+                    'reward_tier'        => '',
                     'start_index'        => 0,
                     'target_index'       => 0,
                     'roll_array'         => '[]',

server/app/api/controller/UserController.php

@@ -91,7 +91,7 @@ class UserController extends BaseController
         if (empty($user)) {
             return $this->fail('User not found', ReturnCode::NOT_FOUND);
         }
-        $fields = ['id', 'username', 'phone', 'uid', 'name', 'coin', 'total_ticket_count'];
+        $fields = ['id', 'username', 'phone', 'uid', 'name', 'coin', 'total_ticket_count', 'free_ticket'];
         $info = [];
         foreach ($fields as $field) {
             if (array_key_exists($field, $user)) {

server/app/api/logic/PlayStartLogic.php

@@ -24,6 +24,8 @@ use support\think\Db;
  */
 class PlayStartLogic
 {
+    /** 钱包流水类型：购买抽奖次数 */
+    public const WALLET_TYPE_BUY_DRAW = 2;
     /** 抽奖类型：付费 */
     public const LOTTERY_TYPE_PAID = 0;
     /** 抽奖类型：免费 */
@@ -74,12 +76,32 @@ class PlayStartLogic
             throw new ApiException('当前注数不合规，请选择正确的注数');
         }
 
-        // 免费抽奖：不再使用抽奖券作为开始条件，仅用 free_ticket_count 表示“免费抽奖次数”
+        // 免费抽奖：优先使用 free_ticket（带 ante 与 count）；兼容旧字段 free_ticket_count
-        $freeCount = (int) ($player->free_ticket_count ?? 0);
+        $freeTicket = $player->free_ticket ?? null;
-        $isFree = $freeCount > 0;
+        $freeTicketAnte = null;
+        $freeTicketCount = 0;
+        if (is_array($freeTicket)) {
+            $a = $freeTicket['ante'] ?? null;
+            $c = $freeTicket['count'] ?? null;
+            if ($a !== null && $a !== '' && is_numeric($a)) {
+                $freeTicketAnte = (int) $a;
+            }
+            if ($c !== null && $c !== '' && is_numeric($c)) {
+                $freeTicketCount = (int) $c;
+            }
+        }
+        $legacyFreeCount = (int) ($player->free_ticket_count ?? 0);
+        $isFree = ($freeTicketAnte !== null && $freeTicketCount > 0) || $legacyFreeCount > 0;
         $ticketType = $isFree ? self::LOTTERY_TYPE_FREE : self::LOTTERY_TYPE_PAID;
 
-        // 若为免费抽奖：注数必须与上一次触发免费抽奖时的注数一致
+        // 若为 free_ticket 免费抽奖：注数必须与券的 ante 一致
+        if ($ticketType === self::LOTTERY_TYPE_FREE && $freeTicketAnte !== null && $freeTicketCount > 0) {
+            if ($ante !== $freeTicketAnte) {
+                throw new ApiException('您有一张底注为' . $freeTicketAnte . '的免费抽奖券');
+            }
+        }
+
+        // 若为免费抽奖（旧逻辑）：注数必须与上一次触发免费抽奖时的注数一致
         if ($isFree) {
             $requiredAnte = Cache::get(self::FREE_ANTE_KEY_PREFIX . $playerId);
             if ($requiredAnte !== null && $requiredAnte !== '' && (int) $requiredAnte !== $ante) {
@@ -231,7 +253,6 @@ class PlayStartLogic
                 $adminId,
                 $configId,
                 $type0ConfigId,
-                $rewardId,
                 $configName,
                 $ticketType,
                 $ante,
@@ -247,8 +268,10 @@ class PlayStartLogic
                 $targetIndex,
                 $rollArray,
                 $isTierT5,
+                $tier,
                 &$record
             ) {
+                $rewardTier = ($isWin === 1 && $superWinCoin > 0) ? 'BIGWIN' : (string) ($tier ?? '');
                 $record = DicePlayRecord::create([
                     'player_id'          => $playerId,
                     'admin_id'           => $adminId,
@@ -260,14 +283,12 @@ class PlayStartLogic
                     'win_coin'           => $winCoin,
                     'super_win_coin'     => $superWinCoin,
                     'reward_win_coin'    => $rewardWinCoin,
-                    'use_coins'          => $paidAmount,
                     'direction'          => $direction,
-                    'reward_config_id'   => $rewardId,
+                    'reward_tier'        => $rewardTier,
                     'start_index'        => $startIndex,
                     'target_index'       => $targetIndex,
                     'roll_array'         => is_array($rollArray) ? json_encode($rollArray) : $rollArray,
                     'roll_number'        => is_array($rollArray) ? array_sum($rollArray) : 0,
-                    'lottery_name'       => $configName,
                     'status'             => self::RECORD_STATUS_SUCCESS,
                 ]);
 
@@ -279,10 +300,32 @@ class PlayStartLogic
                 // 开始前先扣付费金额，再加中奖金额（免费抽奖 paid_amount=0）
                 $coinAfter = $coinBefore - $paidAmount + $winCoin;
                 $p->coin = $coinAfter;
-                // 不再使用抽奖券作为抽奖条件：付费不扣抽奖次数；免费抽奖仅消耗 free_ticket_count
+                // 免费抽奖消耗：优先消耗 free_ticket.count，耗尽则清空 free_ticket；否则兼容旧 free_ticket_count
                 if ($ticketType === self::LOTTERY_TYPE_FREE) {
+                    $ft = $p->free_ticket ?? null;
+                    $ftAnte = null;
+                    $ftCount = 0;
+                    if (is_array($ft)) {
+                        $a = $ft['ante'] ?? null;
+                        $c = $ft['count'] ?? null;
+                        if ($a !== null && $a !== '' && is_numeric($a)) {
+                            $ftAnte = (int) $a;
+                        }
+                        if ($c !== null && $c !== '' && is_numeric($c)) {
+                            $ftCount = (int) $c;
+                        }
+                    }
+                    if ($ftAnte !== null && $ftCount > 0) {
+                        $next = $ftCount - 1;
+                        if ($next <= 0) {
+                            $p->free_ticket = null;
+                        } else {
+                            $p->free_ticket = ['ante' => $ftAnte, 'count' => $next];
+                        }
+                    } else {
                         $p->free_ticket_count = max(0, (int) $p->free_ticket_count - 1);
                     }
+                }
 
                 // 记录每次游玩：写入抽奖券记录（用于后台“抽奖券记录”追踪付费/免费游玩与消耗）
                 $isPaidPlay = $ticketType === self::LOTTERY_TYPE_PAID;
@@ -299,9 +342,32 @@ class PlayStartLogic
                     'remark'             => ($isPaidPlay ? '付费游玩' : '免费游玩') . '|play_record_id=' . $record->id,
                 ]);
 
-                // 若本局中奖档位为 T5，则额外赠送 1 次免费抽奖次数（总次数也 +1），并记录抽奖券获取记录
+                // 若本局中奖档位为 T5，则额外赠送 1 次免费抽奖次数：
+                // - 新结构：写入 free_ticket（ante=本局注数，count+1）
+                // - 兼容旧结构：free_ticket_count +1
                 if ($isTierT5) {
+                    $ft = $p->free_ticket ?? null;
+                    $ftAnte = null;
+                    $ftCount = 0;
+                    if (is_array($ft)) {
+                        $a = $ft['ante'] ?? null;
+                        $c = $ft['count'] ?? null;
+                        if ($a !== null && $a !== '' && is_numeric($a)) {
+                            $ftAnte = (int) $a;
+                        }
+                        if ($c !== null && $c !== '' && is_numeric($c)) {
+                            $ftCount = (int) $c;
+                        }
+                    }
+                    if ($ftAnte === null) {
+                        $ftAnte = $ante;
+                    }
+                    if ($ftAnte === $ante) {
+                        $p->free_ticket = ['ante' => $ante, 'count' => $ftCount + 1];
+                    } else {
+                        // 若已有不同注数的免费券，则仍保留旧字段累加，避免覆盖玩家已有券
                         $p->free_ticket_count = (int) $p->free_ticket_count + 1;
+                    }
 
                     DicePlayerTicketRecord::create([
                         'player_id'         => $playerId,
@@ -314,7 +380,15 @@ class PlayStartLogic
                     Cache::set(self::FREE_ANTE_KEY_PREFIX . $playerId, $ante, self::FREE_ANTE_TTL);
                 } else {
                     // 若本次消耗了最后一次免费抽奖，则清理注数锁
-                    if ($ticketType === self::LOTTERY_TYPE_FREE && (int) $p->free_ticket_count <= 0) {
+                    $ft = $p->free_ticket ?? null;
+                    $ftCount = 0;
+                    if (is_array($ft)) {
+                        $c = $ft['count'] ?? null;
+                        if ($c !== null && $c !== '' && is_numeric($c)) {
+                            $ftCount = (int) $c;
+                        }
+                    }
+                    if ($ticketType === self::LOTTERY_TYPE_FREE && $ftCount <= 0 && (int) $p->free_ticket_count <= 0) {
                         Cache::delete(self::FREE_ANTE_KEY_PREFIX . $playerId);
                     }
                 }
@@ -338,15 +412,30 @@ class PlayStartLogic
                     ]);
                 }
 
+                // 钱包流水拆分：先记录购券扣费，再记录抽奖结果（中奖/惩罚）
+                if ($paidAmount > 0) {
+                    $walletAfterBuy = $coinBefore - $paidAmount;
                     DicePlayerWalletRecord::create([
                         'player_id'      => $playerId,
                         'admin_id'       => $adminId,
-                    // 钱包流水记录本局净变化：-付费金额 + 中奖金额（免费抽奖付费金额为 0）
+                        'coin'           => -$paidAmount,
-                    'coin'           => $winCoin - (float) $paidAmount,
+                        'type'           => self::WALLET_TYPE_BUY_DRAW,
-                    'type'           => self::WALLET_TYPE_DRAW,
                         'wallet_before'  => $coinBefore,
+                        'wallet_after'   => $walletAfterBuy,
+                        'remark'         => '抽奖购券扣费|play_record_id=' . $record->id,
+                    ]);
+                }
+
+                $walletBeforeDraw = $coinBefore - $paidAmount;
+                $drawRemark = ($winCoin >= 0 ? '抽奖中奖' : '抽奖惩罚') . '|play_record_id=' . $record->id;
+                DicePlayerWalletRecord::create([
+                    'player_id'      => $playerId,
+                    'admin_id'       => $adminId,
+                    'coin'           => $winCoin,
+                    'type'           => self::WALLET_TYPE_DRAW,
+                    'wallet_before'  => $walletBeforeDraw,
                     'wallet_after'   => $coinAfter,
-                    'remark'         => '抽奖|play_record_id=' . $record->id,
+                    'remark'         => $drawRemark,
                 ]);
             });
         } catch (\Throwable $e) {
@@ -361,9 +450,8 @@ class PlayStartLogic
                         'win_coin'           => 0,
                         'super_win_coin'     => 0,
                         'reward_win_coin'    => 0,
-                        'use_coins'          => 0,
                         'direction'          => $direction,
-                        'reward_config_id'   => 0,
+                        'reward_tier'        => '',
                         'start_index'        => $startIndex,
                         'target_index'       => 0,
                         'roll_array'         => '[]',
@@ -390,7 +478,7 @@ class PlayStartLogic
             $arr['roll_array'] = json_decode($arr['roll_array'], true) ?? [];
         }
         $arr['roll_number'] = is_array($arr['roll_array'] ?? null) ? array_sum($arr['roll_array']) : 0;
-        $arr['tier'] = $tier ?? '';
+        $arr['reward_tier'] = ($isWin === 1 && $superWinCoin > 0) ? 'BIGWIN' : (string) ($tier ?? '');
         // 记录完数据后返回当前玩家余额与抽奖次数
         $arr['coin'] = $updated ? (float) $updated->coin : 0;
         return $arr;
@@ -619,10 +707,10 @@ class PlayStartLogic
 
         $winCoin = $superWinCoin + $rewardWinCoin;
         $configId = $config !== null ? (int) $config->id : 0;
-        $rewardId = ($isWin === 1 && $superWinCoin > 0) ? 0 : $targetIndex;
         $configName = $config !== null ? (string) ($config->name ?? '') : '自定义';
         $costRealEv = $realEv + ($isWin === 1 ? $bigWinRealEv : 0.0);
         $paidAmount = $lotteryType === 0 ? ($ante * self::UNIT_COST) : 0;
+        $rewardTier = ($isWin === 1 && $superWinCoin > 0) ? 'BIGWIN' : (string) ($tier ?? '');
 
         return [
             'player_id'          => 0,
@@ -635,14 +723,12 @@ class PlayStartLogic
             'paid_amount'        => $paidAmount,
             'super_win_coin'     => $superWinCoin,
             'reward_win_coin'    => $rewardWinCoin,
-            'use_coins'          => $paidAmount,
             'direction'          => $direction,
-            'reward_config_id'   => $rewardId,
+            'reward_tier'        => $rewardTier,
             'start_index'        => $startIndex,
             'target_index'       => $targetIndex,
             'roll_array'         => json_encode($rollArray),
             'roll_number'        => array_sum($rollArray),
-            'lottery_name'       => $configName,
             'status'             => self::RECORD_STATUS_SUCCESS,
             'tier'               => $tier,
             'roll_number_for_count' => $rollNumber,

server/app/dice/controller/play_record/DicePlayRecordController.php

@@ -12,7 +12,6 @@ use app\dice\logic\play_record\DicePlayRecordLogic;
 use app\dice\validate\play_record\DicePlayRecordValidate;
 use app\dice\model\player\DicePlayer;
 use app\dice\model\lottery_pool_config\DiceLotteryPoolConfig;
-use app\dice\model\reward\DiceRewardConfig;
 use plugin\saiadmin\service\Permission;
 use support\Request;
 use support\Response;
@@ -57,7 +56,6 @@ class DicePlayRecordController extends BaseController
         AdminScopeHelper::applyAdminScope($query, $this->adminInfo ?? null);
         $query->with([
             'dicePlayer',
-            'diceRewardConfig',
             'diceLotteryPoolConfig',
         ]);
 
@@ -101,23 +99,6 @@ class DicePlayRecordController extends BaseController
         return $this->success($data);
     }
 
-    /**
-     * 获取奖励配置选项（id、ui_text、tier）
-     */
-    #[Permission('玩家抽奖记录列表', 'dice:play_record:index:index')]
-    public function getRewardConfigOptions(Request $request): Response
-    {
-        $list = DiceRewardConfig::field('id,ui_text,tier')->select();
-        $data = $list->map(function ($item) {
-            return [
-                'id' => $item['id'],
-                'ui_text' => $item['ui_text'] ?? '',
-                'tier' => $item['tier'] ?? ''
-            ];
-        })->toArray();
-        return $this->success($data);
-    }
-
     /**
      * 读取数据
      * @param Request $request

server/app/dice/controller/play_record_test/DicePlayRecordTestController.php

@@ -50,7 +50,7 @@ class DicePlayRecordTestController extends BaseController
             ['roll_number', ''],
         ]);
         $query = $this->logic->search($where);
-        $query->with(['diceLotteryPoolConfig', 'diceRewardConfig']);
+        $query->with(['diceLotteryPoolConfig']);
 
         // 按当前筛选条件统计：平台总盈利 = 付费金额(paid_amount 求和) - 玩家总收益(win_coin 求和)
         $sumQuery = clone $query;

server/app/dice/logic/reward_config_record/WeightTestRunner.php

@@ -19,6 +19,26 @@ use support\think\Db;
 class WeightTestRunner
 {
     private const BATCH_SIZE = 10;
+    /** 测试记录写库白名单字段 */
+    private const PLAY_RECORD_TEST_COLUMNS = [
+        'reward_config_record_id',
+        'admin_id',
+        'lottery_config_id',
+        'lottery_type',
+        'is_win',
+        'win_coin',
+        'super_win_coin',
+        'reward_win_coin',
+        'direction',
+        'reward_tier',
+        'ante',
+        'paid_amount',
+        'start_index',
+        'target_index',
+        'roll_array',
+        'roll_number',
+        'status',
+    ];
 
     /**
      * 执行指定测试记录：按付费/免费、顺/逆方向交替模拟（付费顺→付费逆→免费顺→免费逆），每 10 条写入一次测试表并更新进度
@@ -194,10 +214,10 @@ class WeightTestRunner
             'reward_config_record_id' => $rewardConfigRecordId,
         ];
         $keys = [
-            'player_id', 'admin_id', 'lottery_config_id', 'lottery_type', 'is_win', 'win_coin',
+            'admin_id', 'lottery_config_id', 'lottery_type', 'is_win', 'win_coin',
-            'super_win_coin', 'reward_win_coin', 'use_coins', 'direction', 'reward_config_id',
+            'super_win_coin', 'reward_win_coin', 'direction', 'reward_tier',
             'ante', 'paid_amount',
-            'start_index', 'target_index', 'roll_array', 'roll_number', 'lottery_name', 'status',
+            'start_index', 'target_index', 'roll_array', 'roll_number', 'status',
         ];
         foreach ($keys as $k) {
             if (array_key_exists($k, $row)) {
@@ -223,7 +243,19 @@ class WeightTestRunner
             return;
         }
         foreach ($rows as $row) {
-            DicePlayRecordTest::create($row);
+            if (!is_array($row)) {
+                continue;
+            }
+            $payload = [];
+            foreach (self::PLAY_RECORD_TEST_COLUMNS as $column) {
+                if (array_key_exists($column, $row)) {
+                    $payload[$column] = $row[$column];
+                }
+            }
+            if ($payload === []) {
+                continue;
+            }
+            Db::name((new DicePlayRecordTest())->getTable())->insert($payload);
         }
     }
 

server/app/dice/model/play_record/DicePlayRecord.php

@@ -30,7 +30,7 @@ use think\model\relation\BelongsTo;
  * @property  $reward_win_coin 摇色子中奖平台币
  * @property  $use_coins 消耗平台币（兼容字段：付费局=paid_amount，免费局=0）
  * @property  $direction 方向:0=顺时针,1=逆时针
- * @property  $reward_config_id 奖励配置id
+ * @property  $reward_tier 中奖档位：T1,T2,T3,T4,T5,BIGWIN
  * @property  $lottery_id 奖池
  * @property  $start_index 起始索引
  * @property  $target_index 结束索引
@@ -64,15 +64,6 @@ class DicePlayRecord extends BaseModel
         return $this->belongsTo(DicePlayer::class, 'player_id', 'id');
     }
 
-    /**
-     * 中奖配置
-     * 关联模型 diceRewardConfig
-     */
-    public function diceRewardConfig(): BelongsTo
-    {
-        return $this->belongsTo(DiceRewardConfig::class, 'reward_config_id', 'id');
-    }
-
     /**
      * 彩金池配置
      * 关联模型 diceLotteryPoolConfig
@@ -252,24 +243,19 @@ class DicePlayRecord extends BaseModel
         }
         $ids = DiceRewardConfig::where('ui_text', 'like', '%' . $value . '%')->column('id');
         if (!empty($ids)) {
-            $query->whereIn('reward_config_id', $ids);
+            $query->whereIn('target_index', $ids);
         } else {
             $query->whereRaw('1=0');
         }
     }
 
-    /** 按奖励档位（diceRewardConfig.tier，中奖名 T1-T5） */
+    /** 按奖励档位（表字段 reward_tier，中奖名 T1-T5/BIGWIN） */
     public function searchRewardTierAttr($query, $value)
     {
         if ($value === '' || $value === null) {
             return;
         }
-        $ids = DiceRewardConfig::where('tier', '=', $value)->column('id');
+        $query->where('reward_tier', '=', $value);
-        if (!empty($ids)) {
-            $query->whereIn('reward_config_id', $ids);
-        } else {
-            $query->whereRaw('1=0');
-        }
     }
 
     /** 方向 0=顺时针 1=逆时针 */

server/app/dice/model/play_record_test/DicePlayRecordTest.php

@@ -7,7 +7,6 @@
 namespace app\dice\model\play_record_test;
 
 use plugin\saiadmin\basic\think\BaseModel;
-use app\dice\model\reward_config\DiceRewardConfig;
 use app\dice\model\reward_config_record\DiceRewardConfigRecord;
 use app\dice\model\lottery_pool_config\DiceLotteryPoolConfig;
 use think\model\relation\BelongsTo;
@@ -25,7 +24,7 @@ use think\model\relation\BelongsTo;
  * @property  int|null $ante 底注/注数（dice_ante_config.mult）
  * @property  int|null $paid_amount 付费金额（付费局=ante*100，免费局=0）
  * @property  $direction 方向:0=顺时针,1=逆时针
- * @property  $reward_config_id 奖励配置id
+ * @property  $reward_tier 中奖档位：T1,T2,T3,T4,T5,BIGWIN
  * @property  $create_time 创建时间
  * @property  $update_time 修改时间
  * @property  $start_index 起始索引
@@ -61,15 +60,6 @@ class DicePlayRecordTest extends BaseModel
         return $this->belongsTo(DiceLotteryPoolConfig::class, 'lottery_config_id', 'id');
     }
 
-    /**
-     * 奖励配置（终点格 = target_index 对应 DiceRewardConfig.id，表中为 reward_config_id）
-     * 关联 reward_config_id -> DiceRewardConfig.id
-     */
-    public function diceRewardConfig(): BelongsTo
-    {
-        return $this->belongsTo(DiceRewardConfig::class, 'reward_config_id', 'id');
-    }
-
     /**
      * 关联的权重测试记录
      * reward_config_record_id -> DiceRewardConfigRecord.id
@@ -135,18 +125,13 @@ class DicePlayRecordTest extends BaseModel
         }
     }
 
-    /** 中奖档位（按 reward_config_id 对应 DiceRewardConfig.tier） */
+    /** 中奖档位（按表字段 reward_tier） */
     public function searchRewardTierAttr($query, $value)
     {
         if ($value === '' || $value === null) {
             return;
         }
-        $ids = DiceRewardConfig::where('tier', '=', $value)->column('id');
+        $query->where('reward_tier', '=', $value);
-        if (!empty($ids)) {
-            $query->whereIn('reward_config_id', $ids);
-        } else {
-            $query->whereRaw('1=0');
-        }
     }
 
     /** 点数和 roll_number（摇取点数和 5-30） */

server/app/dice/model/player/DicePlayer.php

@@ -32,6 +32,7 @@ use app\dice\model\lottery_pool_config\DiceLotteryPoolConfig;
  * @property  $total_ticket_count 总抽奖次数
  * @property  $paid_ticket_count 购买抽奖次数
  * @property  $free_ticket_count 赠送抽奖次数
+ * @property  array|null $free_ticket 免费抽奖券：{"ante":1,"count":1}
  * @property  $create_time 创建时间
  * @property  $update_time 更新时间
  * @property  $delete_time 删除时间
@@ -54,6 +55,10 @@ class DicePlayer extends BaseModel
 
     protected $updateTime = 'update_time';
 
+    protected $json = ['free_ticket'];
+
+    protected $jsonAssoc = true;
+
     /**
      * 新增前：生成唯一 uid，昵称 name 默认使用 uid
      * 用 try-catch 避免表尚未含 uid 时 getAttr/getData 抛 InvalidArgumentException

server/app/dice/validate/play_record/DicePlayRecordValidate.php

@@ -22,7 +22,7 @@ class DicePlayRecordValidate extends BaseValidate
         'lottery_type' => 'require',
         'is_win' => 'require',
         'win_coin' => 'require',
-        'reward_config_id' => 'require',
+        'reward_tier' => 'require',
         'roll_array' => 'require|checkRollArray',
     ];
 
@@ -35,7 +35,7 @@ class DicePlayRecordValidate extends BaseValidate
         'lottery_type' => '抽奖类型必须填写',
         'is_win' => '中奖必须填写',
         'win_coin' => '赢取平台币必须填写',
-        'reward_config_id' => '奖励配置必须填写',
+        'reward_tier' => '中奖档位必须填写',
         'roll_array.require' => '摇取点数必须填写',
     ];
 
@@ -49,7 +49,7 @@ class DicePlayRecordValidate extends BaseValidate
             'lottery_type',
             'is_win',
             'win_coin',
-            'reward_config_id',
+            'reward_tier',
             'roll_array',
         ],
         'update' => [
@@ -58,7 +58,7 @@ class DicePlayRecordValidate extends BaseValidate
             'lottery_type',
             'is_win',
             'win_coin',
-            'reward_config_id',
+            'reward_tier',
             'roll_array',
         ],
     ];

server/app/dice/validate/play_record_test/DicePlayRecordTestValidate.php

@@ -21,7 +21,7 @@ class DicePlayRecordTestValidate extends BaseValidate
         'lottery_type' => 'require',
         'is_win' => 'require',
         'direction' => 'require',
-        'reward_config_id' => 'require',
+        'reward_tier' => 'require',
         'status' => 'require',
     ];
 
@@ -33,7 +33,7 @@ class DicePlayRecordTestValidate extends BaseValidate
         'lottery_type' => '抽奖类型:0=付费,1=免费必须填写',
         'is_win' => '中大奖:0=无,1=中奖必须填写',
         'direction' => '方向:0=顺时针,1=逆时针必须填写',
-        'reward_config_id' => '奖励配置id必须填写',
+        'reward_tier' => '中奖档位必须填写',
         'status' => '状态:0=失败,1=成功必须填写',
     ];
 
@@ -46,7 +46,7 @@ class DicePlayRecordTestValidate extends BaseValidate
             'lottery_type',
             'is_win',
             'direction',
-            'reward_config_id',
+            'reward_tier',
             'status',
         ],
         'update' => [
@@ -54,7 +54,7 @@ class DicePlayRecordTestValidate extends BaseValidate
             'lottery_type',
             'is_win',
             'direction',
-            'reward_config_id',
+            'reward_tier',
             'status',
         ],
     ];

server/config/route.php

@@ -46,7 +46,7 @@ Route::group('/api', function () {
     Route::any('/user/walletRecord', [app\api\controller\UserController::class, 'walletRecord']);
     Route::any('/user/playGameRecord', [app\api\controller\UserController::class, 'playGameRecord']);
     Route::any('/game/config', [app\api\controller\GameController::class, 'config']);
-    Route::any('/game/buyLotteryTickets', [app\api\controller\GameController::class, 'buyLotteryTickets']);
+//    Route::any('/game/buyLotteryTickets', [app\api\controller\GameController::class, 'buyLotteryTickets']);
     Route::any('/game/lotteryPool', [app\api\controller\GameController::class, 'lotteryPool']);
     Route::any('/game/anteConfig', [app\api\controller\GameController::class, 'anteConfig']);
     Route::any('/game/playStart', [app\api\controller\GameController::class, 'playStart']);

server/plugin/saiadmin/config/route.php

@@ -97,7 +97,6 @@ Route::group('/core', function () {
     fastRoute('dice/play_record/DicePlayRecord', \app\dice\controller\play_record\DicePlayRecordController::class);
     Route::get('/dice/play_record/DicePlayRecord/getPlayerOptions', [\app\dice\controller\play_record\DicePlayRecordController::class, 'getPlayerOptions']);
     Route::get('/dice/play_record/DicePlayRecord/getLotteryConfigOptions', [\app\dice\controller\play_record\DicePlayRecordController::class, 'getLotteryConfigOptions']);
-    Route::get('/dice/play_record/DicePlayRecord/getRewardConfigOptions', [\app\dice\controller\play_record\DicePlayRecordController::class, 'getRewardConfigOptions']);
     fastRoute('dice/player_wallet_record/DicePlayerWalletRecord', \app\dice\controller\player_wallet_record\DicePlayerWalletRecordController::class);
     Route::get('/dice/player_wallet_record/DicePlayerWalletRecord/getPlayerOptions', [\app\dice\controller\player_wallet_record\DicePlayerWalletRecordController::class, 'getPlayerOptions']);
     Route::get('/dice/player_wallet_record/DicePlayerWalletRecord/getPlayerWalletBefore', [\app\dice\controller\player_wallet_record\DicePlayerWalletRecordController::class, 'getPlayerWalletBefore']);

项目文档.md

@@ -120,7 +120,7 @@
 - **`DiceReward`**：按档位、方向组织好的多语言/展示与 `grid_number`、`weight`、`real_ev` 等，供开局加权抽取。  
 - **`DiceRewardConfig`**：含 **BIGWIN** 档及普通档；`getCachedMinRealEv()` 等用于全局限定。  
 - **`dice_lottery_pool_config`**：`default` / `killScore` 的 T1–T5 权重及杀分相关开关、安全线、累计盈利。  
-- **对局表 `DicePlayRecord`**：记录 `lottery_config_id`、`lottery_type`（付费/免费）、`ante`、`paid_amount`、`roll_array`、`reward_config_id`、各类中奖拆分字段等，供后台与平台对账。
+- **对局表 `DicePlayRecord`**：记录 `lottery_config_id`、`lottery_type`（付费/免费）、`ante`、`paid_amount`、`roll_array`、`reward_tier`、各类中奖拆分字段等，供后台与平台对账。
 
 ---