优化一键测试权重

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

@@ -57,14 +57,15 @@ export default {
   },
 
   /**
-   * 一键测试权重：创建测试记录并启动后台执行，按付费/免费、顺逆方向交替抽奖
-   * 可选 lottery_config_id；不选则传 paid_tier_weights / free_tier_weights（T1-T5）
+   * 一键测试权重：创建测试记录并启动后台执行
+   * chain_free_mode=true：仅模拟付费次数；付费抽到再来一次则插入免费抽奖（同底注、付费金额 0）
    */
   startWeightTest(params: {
     ante?: number
     lottery_config_id?: number
     paid_lottery_config_id?: number
     free_lottery_config_id?: number
+    chain_free_mode?: boolean
     s_count?: number
     n_count?: number
     paid_s_count?: number

saiadmin-artd/src/views/plugin/dice/reward/index/modules/weight-test-dialog.vue

@@ -11,155 +11,125 @@
       <template #title>{{ $t('page.weightTest.alertTitle') }}</template>
       {{ $t('page.weightTest.alertBody') }}
     </ElAlert>
-    <ElForm ref="formRef" :model="form" label-width="140px">
+    <ElAlert type="warning" :closable="false" show-icon class="weight-test-tip chain-tip">
+      {{ $t('page.weightTest.chainModeHint') }}
+    </ElAlert>
+    <ElForm :model="form" label-width="140px">
       <ElFormItem :label="$t('page.weightTest.labelAnte')" prop="ante" required>
         <ElInputNumber v-model="form.ante" :min="1" :step="1" style="width: 100%" />
       </ElFormItem>
-      <ElSteps :active="currentStep" finish-status="success" simple class="steps-wrap">
-        <ElStep :title="$t('page.weightTest.stepPaid')" />
-        <ElStep :title="$t('page.weightTest.stepFree')" />
-      </ElSteps>
 
-      <!-- 第一页：付费抽奖券 -->
-      <div v-show="currentStep === 0" class="step-panel">
-        <ElFormItem
-          :label="$t('page.weightTest.labelLotteryTypePaid')"
-          prop="paid_lottery_config_id"
+      <div class="section-title">{{ $t('page.weightTest.sectionPaid') }}</div>
+      <ElFormItem
+        :label="$t('page.weightTest.labelLotteryTypePaid')"
+        prop="paid_lottery_config_id"
+      >
+        <ElSelect
+          v-model="form.paid_lottery_config_id"
+          :placeholder="$t('page.weightTest.placeholderPaidPool')"
+          clearable
+          filterable
+          style="width: 100%"
         >
-          <ElSelect
-            v-model="form.paid_lottery_config_id"
-            :placeholder="$t('page.weightTest.placeholderPaidPool')"
-            clearable
-            filterable
-            style="width: 100%"
-          >
-            <ElOption
-              v-for="item in paidLotteryOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </ElSelect>
-        </ElFormItem>
-        <template v-if="form.paid_lottery_config_id == null">
-          <div class="tier-label">{{ $t('page.weightTest.tierProbHint') }}</div>
-          <ElRow :gutter="12" class="tier-row">
-            <ElCol v-for="t in tierKeys" :key="'paid-' + t" :span="8">
-              <div class="tier-field">
-                <label class="tier-field-label">{{
-                  $t('page.weightTest.tierFieldLabel', { tier: t })
-                }}</label>
-                <input
-                  type="number"
-                  :value="getPaidTier(t)"
-                  min="0"
-                  max="100"
-                  placeholder="0"
-                  class="tier-input"
-                  @input="setPaidTier(t, $event)"
-                />
-              </div>
-            </ElCol>
-          </ElRow>
-          <div v-if="paidTierSum > 100" class="tier-error">{{
-            $t('page.weightTest.tierSumError', { sum: paidTierSum })
-          }}</div>
-        </template>
-        <ElFormItem :label="$t('page.weightTest.labelCwCount')" prop="paid_s_count" required>
-          <ElSelect
-            v-model="form.paid_s_count"
-            :placeholder="$t('page.weightTest.placeholderSelect')"
-            style="width: 100%"
-          >
-            <ElOption v-for="c in countOptions" :key="c" :label="String(c)" :value="c" />
-          </ElSelect>
-        </ElFormItem>
-        <ElFormItem :label="$t('page.weightTest.labelCcwCount')" prop="paid_n_count" required>
-          <ElSelect
-            v-model="form.paid_n_count"
-            :placeholder="$t('page.weightTest.placeholderSelect')"
-            style="width: 100%"
-          >
-            <ElOption v-for="c in countOptions" :key="c" :label="String(c)" :value="c" />
-          </ElSelect>
-        </ElFormItem>
-      </div>
+          <ElOption
+            v-for="item in paidLotteryOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </ElSelect>
+      </ElFormItem>
+      <template v-if="form.paid_lottery_config_id == null">
+        <div class="tier-label">{{ $t('page.weightTest.tierProbHint') }}</div>
+        <ElRow :gutter="12" class="tier-row">
+          <ElCol v-for="t in tierKeys" :key="'paid-' + t" :span="8">
+            <div class="tier-field">
+              <label class="tier-field-label">{{
+                $t('page.weightTest.tierFieldLabel', { tier: t })
+              }}</label>
+              <input
+                type="number"
+                :value="getPaidTier(t)"
+                min="0"
+                max="100"
+                placeholder="0"
+                class="tier-input"
+                @input="setPaidTier(t, $event)"
+              />
+            </div>
+          </ElCol>
+        </ElRow>
+        <div v-if="paidTierSum > 100" class="tier-error">{{
+          $t('page.weightTest.tierSumError', { sum: paidTierSum })
+        }}</div>
+      </template>
+      <ElFormItem :label="$t('page.weightTest.labelCwCount')" prop="paid_s_count" required>
+        <ElSelect
+          v-model="form.paid_s_count"
+          :placeholder="$t('page.weightTest.placeholderSelect')"
+          style="width: 100%"
+        >
+          <ElOption v-for="c in countOptions" :key="c" :label="String(c)" :value="c" />
+        </ElSelect>
+      </ElFormItem>
+      <ElFormItem :label="$t('page.weightTest.labelCcwCount')" prop="paid_n_count" required>
+        <ElSelect
+          v-model="form.paid_n_count"
+          :placeholder="$t('page.weightTest.placeholderSelect')"
+          style="width: 100%"
+        >
+          <ElOption v-for="c in countOptions" :key="c" :label="String(c)" :value="c" />
+        </ElSelect>
+      </ElFormItem>
 
-      <!-- 第二页：免费抽奖券 -->
-      <div v-show="currentStep === 1" class="step-panel">
-        <ElFormItem
-          :label="$t('page.weightTest.labelLotteryTypeFree')"
-          prop="free_lottery_config_id"
+      <div class="section-title">{{ $t('page.weightTest.sectionFreeAfterPlayAgain') }}</div>
+      <ElFormItem
+        :label="$t('page.weightTest.labelLotteryTypeFree')"
+        prop="free_lottery_config_id"
+      >
+        <ElSelect
+          v-model="form.free_lottery_config_id"
+          :placeholder="$t('page.weightTest.placeholderFreePool')"
+          clearable
+          filterable
+          style="width: 100%"
         >
-          <ElSelect
-            v-model="form.free_lottery_config_id"
-            :placeholder="$t('page.weightTest.placeholderFreePool')"
-            clearable
-            filterable
-            style="width: 100%"
-          >
-            <ElOption
-              v-for="item in freeLotteryOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </ElSelect>
-        </ElFormItem>
-        <template v-if="form.free_lottery_config_id == null">
-          <div class="tier-label">{{ $t('page.weightTest.tierProbHint') }}</div>
-          <ElRow :gutter="12" class="tier-row">
-            <ElCol v-for="t in tierKeys" :key="'free-' + t" :span="8">
-              <div class="tier-field">
-                <label class="tier-field-label">{{
-                  $t('page.weightTest.tierFieldLabel', { tier: t })
-                }}</label>
-                <input
-                  type="number"
-                  :value="getFreeTier(t)"
-                  min="0"
-                  max="100"
-                  placeholder="0"
-                  class="tier-input"
-                  @input="setFreeTier(t, $event)"
-                />
-              </div>
-            </ElCol>
-          </ElRow>
-          <div v-if="freeTierSum > 100" class="tier-error">{{
-            $t('page.weightTest.tierSumError', { sum: freeTierSum })
-          }}</div>
-        </template>
-        <ElFormItem :label="$t('page.weightTest.labelCwCount')" prop="free_s_count" required>
-          <ElSelect
-            v-model="form.free_s_count"
-            :placeholder="$t('page.weightTest.placeholderSelect')"
-            style="width: 100%"
-          >
-            <ElOption v-for="c in countOptions" :key="c" :label="String(c)" :value="c" />
-          </ElSelect>
-        </ElFormItem>
-        <ElFormItem :label="$t('page.weightTest.labelCcwCount')" prop="free_n_count" required>
-          <ElSelect
-            v-model="form.free_n_count"
-            :placeholder="$t('page.weightTest.placeholderSelect')"
-            style="width: 100%"
-          >
-            <ElOption v-for="c in countOptions" :key="c" :label="String(c)" :value="c" />
-          </ElSelect>
-        </ElFormItem>
-      </div>
+          <ElOption
+            v-for="item in freeLotteryOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </ElSelect>
+      </ElFormItem>
+      <template v-if="form.free_lottery_config_id == null">
+        <div class="tier-label">{{ $t('page.weightTest.tierProbHintFreeChain') }}</div>
+        <ElRow :gutter="12" class="tier-row">
+          <ElCol v-for="t in tierKeys" :key="'free-' + t" :span="8">
+            <div class="tier-field">
+              <label class="tier-field-label">{{
+                $t('page.weightTest.tierFieldLabel', { tier: t })
+              }}</label>
+              <input
+                type="number"
+                :value="getFreeTier(t)"
+                min="0"
+                max="100"
+                placeholder="0"
+                class="tier-input"
+                @input="setFreeTier(t, $event)"
+              />
+            </div>
+          </ElCol>
+        </ElRow>
+        <div v-if="freeTierSum > 100" class="tier-error">{{
+          $t('page.weightTest.tierSumError', { sum: freeTierSum })
+        }}</div>
+      </template>
     </ElForm>
 
     <template #footer>
-      <ElButton v-if="currentStep > 0" :disabled="running" @click="currentStep--">{{
-        $t('page.weightTest.btnPrev')
-      }}</ElButton>
-      <ElButton v-if="currentStep < 1" type="primary" :disabled="running" @click="currentStep++">{{
-        $t('page.weightTest.btnNext')
-      }}</ElButton>
       <ElButton
-        v-if="currentStep === 1"
         v-permission="'dice:reward:index:startWeightTest'"
         type="primary"
         :loading="running"
@@ -187,8 +157,6 @@
   const visible = defineModel<boolean>({ default: false })
   const emit = defineEmits<{ (e: 'success'): void }>()
 
-  const formRef = ref()
-  const currentStep = ref(0)
   const form = reactive({
     ante: 1,
     paid_lottery_config_id: undefined as number | undefined,
@@ -196,9 +164,7 @@
     paid_tier_weights: { T1: 20, T2: 20, T3: 20, T4: 20, T5: 20 } as Record<string, number>,
     free_tier_weights: { T1: 20, T2: 20, T3: 20, T4: 20, T5: 20 } as Record<string, number>,
     paid_s_count: 100,
-    paid_n_count: 100,
-    free_s_count: 100,
-    free_n_count: 100
+    paid_n_count: 100
   })
   const lotteryOptions = ref<Array<{ id: number; name: string }>>([])
   /** 付费抽奖券可选档位：name=default */
@@ -214,7 +180,6 @@
 
   function onClose() {
     running.value = false
-    currentStep.value = 0
   }
 
   function getPaidTier(t: string): string {
@@ -255,12 +220,10 @@
         id: r.id,
         name: r.name
       }))
-      // 付费抽奖券默认使用 name=default
       const normal = list.find((r: { name?: string }) => r.name === 'default')
       if (normal) {
         form.paid_lottery_config_id = normal.id
       }
-      // 免费抽奖券默认使用 name=killScore；若无则默认选第一项
       const kill = list.find((r: { name?: string }) => r.name === 'killScore')
       if (kill) {
         form.free_lottery_config_id = kill.id
@@ -277,8 +240,9 @@
       ante: form.ante,
       paid_s_count: form.paid_s_count,
       paid_n_count: form.paid_n_count,
-      free_s_count: form.free_s_count,
-      free_n_count: form.free_n_count
+      free_s_count: 0,
+      free_n_count: 0,
+      chain_free_mode: true
     }
     if (form.paid_lottery_config_id != null) {
       payload.paid_lottery_config_id = form.paid_lottery_config_id
@@ -298,8 +262,8 @@
       ElMessage.warning(t('page.weightTest.warnAnte'))
       return false
     }
-    if (form.paid_s_count + form.paid_n_count + form.free_s_count + form.free_n_count <= 0) {
-      ElMessage.warning(t('page.weightTest.warnTotalSpins'))
+    if (form.paid_s_count + form.paid_n_count <= 0) {
+      ElMessage.warning(t('page.weightTest.warnPaidSpins'))
       return false
     }
     const needPaidTier = form.paid_lottery_config_id == null
@@ -351,28 +315,22 @@
       onClose()
     }
   })
-
-  // 切换到免费步骤时，若当前选中 id 不在免费档位列表中，则重置为第一个 killScore 的选项，避免显示错误
-  watch(currentStep, (step) => {
-    if (step === 1) {
-      const freeOpts = freeLotteryOptions.value
-      const id = form.free_lottery_config_id
-      if (freeOpts.length && (id == null || !freeOpts.some((o) => o.id === id))) {
-        form.free_lottery_config_id = freeOpts[0].id
-      }
-    }
-  })
 </script>
 
 <style lang="scss" scoped>
   .weight-test-tip {
     margin-bottom: 16px;
   }
-  .steps-wrap {
-    margin-bottom: 16px;
+  .chain-tip {
+    margin-top: -8px;
   }
-  .step-panel {
-    min-height: 200px;
+  .section-title {
+    font-size: 14px;
+    font-weight: 600;
+    color: var(--el-text-color-primary);
+    margin: 8px 0 12px;
+    padding-bottom: 6px;
+    border-bottom: 1px solid var(--el-border-color-lighter);
   }
   .tier-label {
     font-size: 13px;

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

@@ -40,19 +40,18 @@
         <template #status="{ row }">
           <span>{{ formatStatus(row.status) }}</span>
         </template>
-        <!-- 付费抽取：顺时针、逆时针抽取次数（兼容旧数据用 s_count/n_count） -->
+        <!-- 付费抽取：顺时针、逆时针抽取次数 -->
         <template #paid_draw="{ row }">
           <span
             >{{ $t('page.table.clockwiseAbbr') }} {{ getPaidS(row) }} /
             {{ $t('page.table.counterclockwiseAbbr') }} {{ getPaidN(row) }}</span
           >
         </template>
-        <!-- 免费抽取：顺时针、逆时针抽取次数 -->
-        <template #free_draw="{ row }">
-          <span
-            >{{ $t('page.table.clockwiseAbbr') }} {{ row.free_s_count ?? 0 }} /
-            {{ $t('page.table.counterclockwiseAbbr') }} {{ row.free_n_count ?? 0 }}</span
-          >
+        <template #chain_mode="{ row }">
+          <span>{{ formatChainMode(row) }}</span>
+        </template>
+        <template #total_draw="{ row }">
+          <span>{{ formatTotalDraw(row) }}</span>
         </template>
         <!-- 平台赚取金额 -->
         <template #platform_profit="{ row }">
@@ -136,16 +135,12 @@
     return t('page.detail.dash')
   }
 
-  // 付费抽取次数（兼容旧数据：无 paid_s_count 时用 s_count）
+  // 付费抽取次数
   function getPaidS(row: Record<string, any>): number {
-    const v = row.paid_s_count
-    if (v !== undefined && v !== null && (Number(v) || 0) > 0) return Number(v)
-    return Number(row.s_count ?? 0)
+    return Number(row.paid_s_count ?? 0)
   }
   function getPaidN(row: Record<string, any>): number {
-    const v = row.paid_n_count
-    if (v !== undefined && v !== null && (Number(v) || 0) > 0) return Number(v)
-    return Number(row.n_count ?? 0)
+    return Number(row.paid_n_count ?? 0)
   }
 
   // 平台赚取金额展示（未完成或空显示 —）
@@ -157,6 +152,31 @@
     return String(n)
   }
 
+  /** 链式再来一次：1=是（新库字段），JSON 旧数据用 tier_weights_snapshot.chain_free_mode */
+  function formatChainMode(row: Record<string, any>): string {
+    const v = row.chain_free_mode
+    if (v === 1 || v === '1' || v === true) return t('page.table.chainModeYes')
+    const snap = row.tier_weights_snapshot
+    if (snap && typeof snap === 'object' && (snap as { chain_free_mode?: boolean }).chain_free_mode) {
+      return t('page.table.chainModeYes')
+    }
+    return t('page.table.chainModeNo')
+  }
+
+  /** 总抽奖次数：仅完成态写最终值；测试中显示已完成次数 */
+  function formatTotalDraw(row: Record<string, any>): string {
+    const status = Number(row.status)
+    const done = Number(row.total_play_count ?? 0)
+    const over = Number(row.over_play_count ?? 0)
+    if (status === 1) {
+      return String(done)
+    }
+    if (status === -1) {
+      return over > 0 ? t('page.table.progressFailed', { over }) : t('page.detail.dash')
+    }
+    return t('page.table.progressDraws', { over })
+  }
+
   // 表格配置
   const {
     columns,
@@ -193,12 +213,24 @@
           useSlot: true
         },
         {
-          prop: 'free_draw',
-          label: 'page.table.freeDraw',
-          width: 160,
+          prop: 'chain_mode',
+          label: 'page.table.chainMode',
+          width: 110,
           align: 'center',
           useSlot: true
         },
+        {
+          prop: 'paid_planned_spins',
+          label: 'page.table.paidPlannedSpins',
+          width: 120,
+          align: 'center'
+        },
+        {
+          prop: 'play_again_count',
+          label: 'page.table.playAgainCount',
+          width: 120,
+          align: 'center'
+        },
         {
           prop: 'platform_profit',
           label: 'page.table.platformProfit',
@@ -206,7 +238,13 @@
           align: 'center',
           useSlot: true
         },
-        { prop: 'total_play_count', label: 'page.table.totalDrawCount', width: 110, align: 'center' },
+        {
+          prop: 'total_draw',
+          label: 'page.table.totalDrawCount',
+          width: 140,
+          align: 'center',
+          useSlot: true
+        },
         {
           prop: 'admin_name',
           label: 'page.table.createdBy',

saiadmin-artd/src/views/plugin/dice/reward_config_record/index/modules/detail-drawer.vue

@@ -14,9 +14,15 @@
           <el-descriptions-item :label="$t('page.detail.recordId')">
             {{ record.id }}
           </el-descriptions-item>
-          <el-descriptions-item :label="$t('page.detail.testCount')"
-            >{{ record.test_count }}{{ $t('page.detail.testCountSuffix') }}</el-descriptions-item
-          >
+          <el-descriptions-item :label="$t('page.detail.chainModeLabel')">
+            {{ formatChainModeDetail(record) }}
+          </el-descriptions-item>
+          <el-descriptions-item :label="$t('page.detail.paidPlannedSpins')">
+            {{ record.paid_planned_spins ?? $t('page.detail.dash') }}
+          </el-descriptions-item>
+          <el-descriptions-item :label="$t('page.detail.testCount')">
+            {{ formatTestCountDisplay(record) }}
+          </el-descriptions-item>
           <el-descriptions-item :label="$t('page.detail.createTime')">
             {{ record.create_time || $t('page.detail.dash') }}
           </el-descriptions-item>
@@ -231,6 +237,11 @@
   interface RecordRow {
     id?: number
     test_count?: number
+    total_play_count?: number
+    status?: number
+    over_play_count?: number
+    chain_free_mode?: number | boolean
+    paid_planned_spins?: number
     create_time?: string
     admin_id?: number | null
     admin_name?: string
@@ -238,7 +249,6 @@
     paid_lottery_config_id?: number | null
     free_lottery_config_id?: number | null
     bigwin_weight?: Record<string, number> | Array<[number, number]> | null
-    // 新结构：{ paid: {T1..T5}, free: {T1..T5} }，兼容旧结构直接是 {T1..T5}
     tier_weights_snapshot?:
       | {
           paid?: Record<string, number>
@@ -257,6 +267,32 @@
     result_counts?: Record<string, number>
   }
 
+  function formatChainModeDetail(record: RecordRow | null): string {
+    if (!record) return t('page.detail.dash')
+    const v = record.chain_free_mode
+    if (v === 1 || v === '1' || v === true) return t('page.table.chainModeYes')
+    const snap = record.tier_weights_snapshot
+    if (snap && typeof snap === 'object' && (snap as { chain_free_mode?: boolean }).chain_free_mode) {
+      return t('page.table.chainModeYes')
+    }
+    return t('page.table.chainModeNo')
+  }
+
+  function formatTestCountDisplay(record: RecordRow | null): string {
+    if (!record) return t('page.detail.dash')
+    const status = Number(record.status)
+    if (status === 1) {
+      const n = record.test_count ?? record.total_play_count
+      return `${n ?? 0}${t('page.detail.testCountSuffix')}`
+    }
+    if (status === -1) {
+      const over = Number(record.over_play_count ?? 0)
+      return over > 0 ? t('page.detail.testCountFailed', { over }) : t('page.detail.dash')
+    }
+    const over = Number(record.over_play_count ?? 0)
+    return t('page.detail.testCountProgress', { over })
+  }
+
   interface Props {
     modelValue: boolean
     record: RecordRow | null