33 Commits

Author SHA1 Message Date
ef684a1c55 修改访问时报错404 2026-04-02 11:59:09 +08:00
a8973d4e47 优化直接访问API端口地址返回404不泄漏信息 2026-04-01 10:55:12 +08:00
9f42cffd18 [优化]移除/api/game/lotteryPool接口中不虚言显示的键值 2026-04-01 10:22:18 +08:00
edd870457f 优化前端双语配置 2026-03-31 18:20:03 +08:00
7493c4e400 优化页面/dice/reward_config/index中玩家实际中奖金额的计算 2026-03-31 17:52:18 +08:00
b0e5a3f5c0 重新设置抽奖底注金额为1,优化页面样式 2026-03-31 17:31:19 +08:00
6ed34b97df 重新设置抽奖底注金额为1,优化页面样式 2026-03-31 17:23:16 +08:00
d54a9c9281 优化抽奖接口/api/game/playStart,新增消耗平台币use_coin(=0是为免费抽奖) 2026-03-31 12:02:09 +08:00
afd6113927 一键测试权重-新增安全线杀分机制,保证测试数据合理 2026-03-27 17:50:11 +08:00
2f05ac0cd9 优化抽奖记录(测试权重)页面 2026-03-27 14:37:31 +08:00
ded5e82e16 修复打包报错 2026-03-27 14:19:29 +08:00
e2273ef41c 优化一键测试权重 2026-03-27 14:14:59 +08:00
0bdab95ab7 优化首页样式-移除抽奖券 2026-03-27 10:41:00 +08:00
cfc6537f97 优化奖励配置/按规则一键生成表 2026-03-27 10:26:58 +08:00
e32f3890f1 优化抽奖方式,以及记录相关信息 2026-03-26 18:10:41 +08:00
77ec0dcade 优化页面不显示小数 2026-03-26 14:31:32 +08:00
d72a8487a8 项目介绍-优化 2026-03-26 14:25:45 +08:00
7596007a5a 项目介绍 2026-03-26 14:19:35 +08:00
1b448833c6 优化【查看当前彩金池】翻译 2026-03-26 14:05:20 +08:00
748ee12a52 优化平台币显示样式不显示小数点,优化中大奖计算 2026-03-26 13:58:45 +08:00
d793a511ee [色子游戏]抽奖记录(测试权重)-优化
[API]记录抽奖券DicePlayerTicketRecord
2026-03-25 18:51:29 +08:00
f8cf85dd01 修改游戏地址为dice-v3-game.yuliao666.top 2026-03-25 17:53:34 +08:00
6c6971c4bf 修改plugin.webman.channel.server端口号为2207 2026-03-25 17:52:05 +08:00
60833aa6ff 修改plugin.webman.channel.server端口号为2207 2026-03-25 17:35:23 +08:00
d0d82399dc 优化前端VITE_API_URL 2026-03-25 16:10:57 +08:00
5b209da678 修复打包报错 2026-03-25 16:02:38 +08:00
d10dc81fc7 修改环境配置文件 2026-03-25 15:52:03 +08:00
6b9fb0c26e 优化游玩方式 2026-03-25 15:51:50 +08:00
9b4104fc0e [API]新增接口/api/game/anteConfig获取底注配置 2026-03-25 14:46:47 +08:00
ce9062e186 [色子游戏]奖励配置-新增按规则自动生成奖励配置 2026-03-25 14:34:04 +08:00
1027612cc0 [色子游戏]底注配置 2026-03-25 14:33:58 +08:00
5ef8ee8bc5 [色子游戏]奖励配置-新增按规则自动生成奖励配置 2026-03-25 13:42:46 +08:00
bd402aa97d v3分支环境配置 2026-03-25 09:42:27 +08:00
115 changed files with 3863 additions and 905 deletions

199
README.md
View File

@@ -1,99 +1,146 @@
<p align="center"> # 大富翁 · 摇色子 — 项目文档
<img src="https://saithink.top/images/logo.png" width="120" />
</p>
<p align="center">
<img src="https://svg.hamm.cn/badge.svg?key=License&value=MIT" />
<img src="https://svg.hamm.cn/badge.svg?key=Version&value=6.x" />
</p>
<div style="padding:18px;max-width: 1024px;margin:0 auto;"> 本文描述**业务玩法**与**服务端抽奖/结算机制**,便于产品、运营与二次开发对齐实现。接口路径、鉴权与联调细节见根目录 [`API对接文档.md`](API对接文档.md)。
<h1>SaiAdmin 6.x</h1>
## 项目简介
SaiAdmin 是一个基于 [Webman](https://www.workerman.net/webman) 的高性能后台管理系统插件。它提供了完整的权限管理、系统配置、代码生成等功能,帮助开发者快速构建企业级应用。
--- ---
## ✨ 核心特性 ## 1. 项目概述
- **🚀 高性能** - 基于 Webman 常驻内存框架,性能优异 - **形态**:平台玩家使用「平台币」参与摇五颗标准六面骰(点数各 16结果对应棋盘/奖励配置;后台可配置档位权重、奖池、杀分策略与展示文案(含中英文)。
- **🔐 完整权限系统** - RBAC 权限模型,支持用户、角色、部门、岗位管理 - **服务端**PHP [Webman](https://www.workerman.net/webman)`server/`),玩家与平台接口在 `app/api`;骰子业务模型在 `app/dice`
- **📝 代码生成器** - 一键生成 CRUD 代码,提升开发效率 - **管理端**:前端工程 `saiadmin-artd/`(与 SaiAdmin 插件体系配套)。
- **⚡ 双 ORM 支持** - 同时支持 ThinkORM 和 Eloquent ORM
- **🔧 插件化架构** - 支持插件扩展,便于功能模块化
- **📊 系统监控** - 内置服务器监控、缓存管理功能
- **📋 日志系统** - 完整的登录日志和操作日志记录
## 🛠️ 功能模块 ---
### 系统管理 ## 2. 核心概念
| 模块 | 说明 | | 概念 | 说明 |
| ---------- | -------------------------------- | | --- | --- |
| 用户管理 | 用户增删改查、密码管理、缓存清理 | | **平台币 `coin`** | 玩家钱包余额;付费开局、购买套餐、中奖结算均围绕该字段。 |
| 角色管理 | 角色 CRUD、菜单权限分配 | | **注数 `ante`** | 倍数因子,须存在于表 `dice_ante_config``mult` 中;接口 `/api/game/anteConfig` 返回可选注数。 |
| 部门管理 | 组织架构管理、树形结构 | | **单注费用** | 付费抽奖时,开局前扣除 **`ante × 1`** 平台币(代码常量 `UNIT_COST = 1`,即「单注 1 币」口径)。 |
| 岗位管理 | 岗位信息维护、Excel 模板导入导出 | | **方向 `direction`** | 开局参数:`0``1` 对应两套奖励数据(顺时针/逆时针或「无 / 中奖」分支,由前端与配置表共同约定);服务端在 **档位确定后**,按当前方向从 `DiceReward` 缓存结构中取该档位下的条目再按权重抽取。 |
| 菜单管理 | 菜单配置、按钮权限 | | **档位 T1T5** | 中奖层级;先抽档位,再在该档位 + 当前方向下按 `weight` 抽一条奖励配置。 |
| 字典管理 | 字典类型与字典数据维护 | | **`grid_number`530** | 与「五颗骰子点数之和」一致:最小 5全 1最大 30全 6用于关联奖励行与后续生成 `roll_array` |
| 附件管理 | 文件上传、分类管理、资源移动 | | **`real_ev`** | 奖励配置中的期望调节项;**普通中奖**结算为 **`real_ev × ante`**(付费局在开局已扣 `ante×1`,净效果依 `real_ev` 而定)。 |
| 系统配置 | 分组配置、邮件设置、动态参数 |
| 日志管理 | 登录日志、操作日志查询与清理 |
| 服务监控 | 服务器状态、缓存信息、一键清理 |
| 数据表维护 | 数据表结构、表优化、碎片整理 |
### 开发工具 ---
| 模块 | 说明 | ## 3. 玩法流程(玩家视角)
| -------- | ---------------------------- |
| 代码生成 | 根据数据表自动生成 CRUD 代码 |
| 定时任务 | Crontab 任务管理、执行日志 |
<h1>学习</h1> 1. **登录 / 进游戏**
平台侧通过 `/api/v1/getGameUrl` 或玩家侧 `/api/user/Login` 换取 token打开前端页面。
<ul> 2. **(可选)购买「抽奖券」套餐**
<li> `POST /api/game/buyLotteryTickets``count` 仅支持 `1``5``10`
<a href="https://saithink.top" target="_blank">主页 / Home page</a> - 11 币 → 1 次付费计数 + 0 次赠送
</li> - 55 币 → 5 次付费 + **1 次赠送**(共 6 次计入总次数)
<li> - 1010 币 → 10 次付费 + **3 次赠送**(共 13 次)
<a href="https://saithink.top/documents/v6/" target="_blank">文档 / Document</a>
</li>
</ul>
会更新玩家身上的 `total_ticket_count` / `paid_ticket_count` / `free_ticket_count`,并记钱包与券流水。
<h1>演示地址</h1> 3. **开局抽奖**
<p>演示地址: <a href="http://v6.saithink.top" target="_blank">http://v6.saithink.top</a></p> `POST /api/game/playStart`,需传 **`direction`0 或 1** 与 **`ante`(正整数,且须在底注配置中)**。
<p>演示账号admin</p>
<p>演示密码123456</p>
<h1>共同交流</h1> 4. **付费 vs 免费**
- **免费抽奖**:当 `free_ticket_count > 0` 时,本局视为免费类型:不扣 `ante×1`,但会消耗 **1 次** `free_ticket_count`
- **付费抽奖**:不依赖「券张数是否大于 0」只要非免费局开局前扣 **`ante × 1`**。
<table> > **重要**:当前实现已**不再用「抽奖券张数」作为能否开局的条件**`buyLotteryTickets` 更新的是统计与赠送次数,**真正开局仍看余额、注数、免费次数等规则**(见下节)。
<tbody>
<tr>
<td align="center" valign="middle">
<img src="https://saithink.top/images/me.png" class="no-zoom" width="180px">
<p>saiadmin交流群(添加我微信备注"saiadmin")</p>
</td>
</tr>
</tbody>
</table>
<h1>支持项目</h1> 5. **免费注数锁定**
若上一局因命中 **T5** 赠送了免费次数,服务端会缓存「免费局须与触发时相同的 `ante`」,不一致则拒绝并提示修改注数。
如果您正在使用这个项目并感觉良好,或者是想支持我继续开发,您可以通过如下`任意`方式支持我: ---
谢谢! ❤️ ## 4. 抽奖与结算机制(服务端逻辑)
以下对应 `PlayStartLogic``LotteryService`,便于理解「先抽什么、再算什么钱」。
| 微信 | 支付宝 | ### 4.1 前置校验
| :------------------------------------------------------------------------------: | :------------------------------------------------------------------------------: |
| <img src="https://saithink.top/images/wechat.png" alt="Wechat QRcode" width=180> | <img src="https://saithink.top/images/alipay.png" alt="Alipay QRcode" width=180> |
<div style="clear: both"> - 用户存在;`ante` 合法。
<h1>LICENSE</h1> - **最低余额**`coin ≥ abs(min_real_ev) × ante``min_real_ev` 来自全表 `DiceRewardConfig` 缓存),防止极端负 EV 下余额不足以覆盖风险口径。
This project is open-sourced software licensed under the MIT. - 付费局:`coin ≥ ante × 1`
</div>
</div> ### 4.2 使用哪套「档位权重」:默认奖池 vs 杀分奖池
配置表 `dice_lottery_pool_config` 至少要有 **`name = default`**;可选 **`name = killScore`**。
- **`default` 彩金池**维护累计盈利字段 **`profit_amount`**(见 4.5)。
- 记:`safety_line` = 安全线,`kill_enabled` = 是否开启杀分。
**是否按「奖池档位权重」抽档位(`usePoolWeights`**
| 情形 | 档位权重来源 |
| --- | --- |
| **免费局** | 使用 **killScore** 奖池的 T1T5 权重;若无 `killScore` 则退回 `default`。 |
| **付费局****杀分开启****`profit_amount ≥ safety_line`** 且 **存在 killScore** | 使用 **killScore** 的档位权重(杀分模式)。 |
| **其他付费局** | 使用 **玩家**身上的 `t1_weight``t5_weight``DicePlayer` 字段,与 `LotteryService::drawTierByPlayerWeights` 一致)。 |
档位抽出 **T1T5** 后,从 `DiceReward` 缓存中取出 **`[该档位][direction]`** 下的所有奖励行,再按行 **`weight`** 做加权随机(仅 `weight > 0` 参与;全为 0 会重试档位,最多约 10 次)。
### 4.3 杀分模式下的特殊处理
当使用 **killScore / 免费局** 等与杀分一致的权重路径时:
- 在奖励抽取阶段会 **排除 `grid_number` 为 5 和 30 的配置**(这两点数和只能对应「全 1」「全 6」豹子无法做成非豹子展示
- **不会触发豹子大奖**(见 4.4):若摇到豹子点数组,只生成 **非豹子** 的五骰组合,不发放豹子附加奖金。
### 4.4 普通奖与「豹子 / BIGWIN」
- 若本次抽中的 `grid_number` **不是**「豹子集合」`{5,10,15,20,25,30}`:按点数和生成 5 个 16 的骰子(和为 `grid_number`**普通奖金** = **`real_ev × ante`**(付费局已预先扣除 `ante×1`)。
- 若点数和落在豹子集合:
- **`grid_number` 为 5 或 30**:若**非**杀分路径,**必定**按豹子结算(五颗相同点数)。
- **10 / 15 / 20 / 25**:读取 `DiceRewardConfig`**`tier = BIGWIN`** 且对应该 `grid_number` 的配置,用其 **`weight`01000010000=100%** 随机决定是否视为真豹子;否则生成**非豹子**但点数和不变的骰子组合。
- **真豹子**时:奖金按 **`big_win_real_ev × ante`** 发放(`big_win_real_ev` 来自 BIGWIN 配置;若未配则用代码兜底常量);并**不计入**当次普通 `reward_win` 那条配置(与「中豹子不走普通奖」逻辑一致,详见代码注释)。
杀分路径下:**不触发**豹子奖,仅展示非豹子组合。
### 4.5 T5「再来一次」
若命中奖励属于 **T5** 档位(且未走「仅豹子清掉普通奖」的特殊分支):在事务内为玩家 **`free_ticket_count + 1`**,并写入券流水备注;同时写入 Redis**下一局免费抽奖必须使用本局相同 `ante`**。
### 4.6 彩金池盈利累计
**`default`** 那条池子上更新 **`profit_amount`**
- **付费局**:本局贡献 `+= (本局总中奖 win_coin) - (本局付费 paid_amount)`,其中 `paid_amount = ante × 1`
- **免费局**`+= win_coin`(无票价成本,`paid_amount = 0`)。
该累计值与 **`safety_line``kill_enabled`** 共同决定下一局付费是否进入 **killScore** 档位权重(见 4.2)。
> 注意:仓库中部分数据库迁移脚本对 `profit_amount` 的注释可能仍沿用旧口径。当前行为应以 `PlayStartLogic` 中对 `profit_amount` 的实际累加逻辑为准。
---
## 5. 数据与配置要点(实现侧)
- **`DiceReward`**:按档位、方向组织好的多语言/展示与 `grid_number``weight``real_ev` 等,供开局加权抽取。
- **`DiceRewardConfig`**:含 **BIGWIN** 档及普通档;`getCachedMinRealEv()` 等用于全局限定。
- **`dice_lottery_pool_config`**`default` / `killScore` 的 T1T5 权重及杀分相关开关、安全线、累计盈利。
- **对局表 `DicePlayRecord`**:记录 `lottery_config_id``lottery_type`(付费/免费)、`ante``paid_amount``roll_array``reward_tier`、各类中奖拆分字段等,供后台与平台对账。
---
## 6. 接口与文档索引
| 文档 | 内容 |
| --- | --- |
| [`API对接文档.md`](API对接文档.md) | 平台 `/api/v1/*``auth-token`)、玩家 `/api/*``token`)、统一返回码、联调建议。 |
| `server/docs/` | 性能、权重测试、出点分析等专项说明(按需阅读)。 |
**与玩法直接相关的玩家接口示例**
- `GET /api/game/config` — 前端文案与分组配置
- `GET /api/game/anteConfig` — 可选注数
- `GET /api/game/lotteryPool` — 彩金池展示列表(不含 BIGWIN 档)
- `POST /api/game/buyLotteryTickets` — 购买套餐(更新次数统计)
- `POST /api/game/playStart` — 开局一局(`direction``ante`
---
## 7. 修订说明
- 本文档依据 `server/app/api/logic/PlayStartLogic.php``GameLogic.php``LotteryService.php``GameController` 当前实现整理;若业务规则变更,请以代码与数据库迁移为准并同步更新本节与 [`API对接文档.md`](API对接文档.md)。

View File

@@ -7,7 +7,7 @@ VITE_BASE_URL = /
VITE_API_URL = /api VITE_API_URL = /api
# 代理目标地址(开发环境通过 Vite 代理转发请求到此地址,解决跨域问题) # 代理目标地址(开发环境通过 Vite 代理转发请求到此地址,解决跨域问题)
VITE_API_PROXY_URL = http://127.0.0.1:6688 VITE_API_PROXY_URL = http://127.0.0.1:8989
# Delete console # Delete console
VITE_DROP_CONSOLE = false VITE_DROP_CONSOLE = false

View File

@@ -5,7 +5,7 @@
VITE_BASE_URL = ./ VITE_BASE_URL = ./
# API 根地址(后端路由为 /core、/tool、/dice 等,无 /prod 前缀,不要加 /prod # API 根地址(后端路由为 /core、/tool、/dice 等,无 /prod 前缀,不要加 /prod
VITE_API_URL = https://dice-api.yuliao666.top VITE_API_URL = https://dice-v3-api.yuliao666.top
# 登录页是否显示验证码,设为 false 可关闭(需与后端 LOGIN_CAPTCHA_ENABLE 一致) # 登录页是否显示验证码,设为 false 可关闭(需与后端 LOGIN_CAPTCHA_ENABLE 一致)
VITE_LOGIN_CAPTCHA_ENABLED = false VITE_LOGIN_CAPTCHA_ENABLED = false

View File

@@ -0,0 +1,53 @@
/**
* 命令行:按「当前盘面 grid_number 排布」与 T1/T2/T4/T5 约束生成 DiceRewardConfig 表 JSON不含保存
* 用法pnpm tsx scripts/generate-dice-reward-index.ts [t1Fixed] [t2Min] [t4Fixed] [t5Fixed]
* 默认3 5 1 1T4/T5 为顺、逆加权条数固定值)
*
* 生成逻辑见 src/views/plugin/dice/reward_config/utils/generateIndexByRules.ts
*/
import {
buildRowsFromTiers,
computeBoardFrequencies,
DEFAULT_TIER_REAL_EV_STANDARDS,
generateTiers,
summarizeCounts
} from '../src/views/plugin/dice/reward_config/utils/generateIndexByRules'
const grids = [
20, 27, 24, 10, 5, 15, 8, 22, 30, 23, 16, 12, 13, 7, 17, 9, 21, 26, 6, 29, 19, 11, 25, 14, 28, 18
]
const args = process.argv.slice(2).map((x) => parseInt(x, 10))
const t1 = Number.isFinite(args[0]) ? args[0] : 3
const t2 = Number.isFinite(args[1]) ? args[1] : 5
const x4 = Number.isFinite(args[2]) ? args[2] : 1
const x5 = Number.isFinite(args[3]) ? args[3] : 1
const constraints = {
t1FixedCw: t1,
t2MinCw: t2,
t4FixedCw: x4,
t5FixedCw: x5,
t1FixedCcw: t1,
t2MinCcw: t2,
t4FixedCcw: x4,
t5FixedCcw: x5
}
const gen = generateTiers({ grids, constraints })
if (gen.ok === false) {
console.error(gen.message)
process.exit(1)
}
const board = computeBoardFrequencies(grids)
if (board === null) {
console.error('computeBoardFrequencies failed')
process.exit(1)
}
const rows = buildRowsFromTiers(grids, gen.tiers, DEFAULT_TIER_REAL_EV_STANDARDS)
const sc = summarizeCounts(board, gen.tiers)
console.log(JSON.stringify({ weighted: { cw: sc.cw, ccw: sc.ccw }, rows }, null, 2))

View File

@@ -84,7 +84,7 @@
*/ */
const clearCache = (): void => { const clearCache = (): void => {
userStore.clearCache() userStore.clearCache()
ElMessage.success('清理缓存成功') ElMessage.success(t('uiMsg.clearCacheSuccess'))
} }
/** /**

View File

@@ -14,6 +14,7 @@
import { ElMessage, ElMessageBox } from 'element-plus' import { ElMessage, ElMessageBox } from 'element-plus'
import axios from 'axios' import axios from 'axios'
import { useUserStore } from '@/store/modules/user' import { useUserStore } from '@/store/modules/user'
import { $t } from '@/locales'
defineOptions({ name: 'SaExport' }) defineOptions({ name: 'SaExport' })
@@ -42,18 +43,18 @@
const handleExport = async () => { const handleExport = async () => {
if (loading.value) return if (loading.value) return
if (!props.url) { if (!props.url) {
ElMessage.error('未配置导出接口') ElMessage.error($t('uiMsg.exportNotConfigured'))
return return
} }
let finalFileName = props.fileName let finalFileName = props.fileName
try { try {
const { value } = await ElMessageBox.prompt('请输入导出文件名称', '提示', { const { value } = await ElMessageBox.prompt($t('uiMsg.exportPromptFileName'), $t('uiMsg.titlePrompt'), {
confirmButtonText: '确定', confirmButtonText: $t('uiMsg.btnOk'),
cancelButtonText: '取消', cancelButtonText: $t('uiMsg.btnCancel'),
inputValue: props.fileName, inputValue: props.fileName,
inputValidator: (val) => !!val.trim() || '文件名不能为空' inputValidator: (val) => !!val.trim() || $t('uiMsg.exportFileNameRequired')
}) })
finalFileName = value finalFileName = value
} catch { } catch {
@@ -87,10 +88,10 @@
reader.onload = () => { reader.onload = () => {
try { try {
const result = JSON.parse(reader.result as string) const result = JSON.parse(reader.result as string)
ElMessage.error(result.msg || '导出失败') ElMessage.error(result.msg || $t('uiMsg.exportFail'))
emit('error', result) emit('error', result)
} catch (e) { } catch (e) {
ElMessage.error('导出失败') ElMessage.error($t('uiMsg.exportFail'))
emit('error', e) emit('error', e)
} }
} }
@@ -108,11 +109,11 @@
document.body.removeChild(link) document.body.removeChild(link)
URL.revokeObjectURL(url) URL.revokeObjectURL(url)
ElMessage.success('导出成功') ElMessage.success($t('uiMsg.exportSuccess'))
emit('success') emit('success')
} catch (error: any) { } catch (error: any) {
console.error(error) console.error(error)
ElMessage.error(error.message || '导出失败') ElMessage.error(error.message || $t('uiMsg.exportFail'))
emit('error', error) emit('error', error)
} finally { } finally {
loading.value = false loading.value = false

View File

@@ -1,5 +1,6 @@
import { ref, nextTick } from 'vue' import { ref, nextTick } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus' import { ElMessage, ElMessageBox } from 'element-plus'
import { $t } from '@/locales'
/** /**
* SaiAdmin Composable * SaiAdmin Composable
@@ -39,13 +40,13 @@ export function useSaiAdmin() {
apiFn: (params: any) => Promise<any>, apiFn: (params: any) => Promise<any>,
callback?: () => void callback?: () => void
): void => { ): void => {
ElMessageBox.confirm(`确定要删除该数据吗?`, '删除数据', { ElMessageBox.confirm($t('uiMsg.deleteConfirmSingle'), $t('uiMsg.titleDelete'), {
confirmButtonText: '确定', confirmButtonText: $t('uiMsg.btnOk'),
cancelButtonText: '取消', cancelButtonText: $t('uiMsg.btnCancel'),
type: 'error' type: 'error'
}).then(() => { }).then(() => {
apiFn({ ids: [row.id] }).then(() => { apiFn({ ids: [row.id] }).then(() => {
ElMessage.success('删除成功') ElMessage.success($t('uiMsg.deleteSuccess'))
if (callback) callback() if (callback) callback()
}) })
}) })
@@ -57,20 +58,20 @@ export function useSaiAdmin() {
callback?: () => void callback?: () => void
): void => { ): void => {
if (selectedRows.value.length === 0) { if (selectedRows.value.length === 0) {
ElMessage.warning('请选择要删除的行') ElMessage.warning($t('uiMsg.selectRowsToDelete'))
return return
} }
ElMessageBox.confirm( ElMessageBox.confirm(
`确定要删除选中的 ${selectedRows.value.length} 条数据吗?`, $t('uiMsg.deleteConfirmSelected', { n: selectedRows.value.length }),
'删除选中数据', $t('uiMsg.titleDeleteSelected'),
{ {
confirmButtonText: '确定', confirmButtonText: $t('uiMsg.btnOk'),
cancelButtonText: '取消', cancelButtonText: $t('uiMsg.btnCancel'),
type: 'error' type: 'error'
} }
).then(() => { ).then(() => {
apiFn({ ids: selectedRows.value.map((row) => row.id) }).then(() => { apiFn({ ids: selectedRows.value.map((row) => row.id) }).then(() => {
ElMessage.success('删除成功') ElMessage.success($t('uiMsg.deleteSuccess'))
if (callback) callback() if (callback) callback()
selectedRows.value = [] selectedRows.value = []
}) })

View File

@@ -111,7 +111,7 @@ const i18n: I18n = createI18n(i18nOptions)
* 翻译函数类型 * 翻译函数类型
*/ */
interface Translation { interface Translation {
(key: string): string (key: string, named?: Record<string, unknown>): string
} }
/** /**

View File

@@ -39,6 +39,46 @@
"confirm": "Confirm", "confirm": "Confirm",
"logOutTips": "Do you want to log out?" "logOutTips": "Do you want to log out?"
}, },
"uiMsg": {
"titlePrompt": "Prompt",
"titleDelete": "Delete",
"titleDeleteSelected": "Delete selected",
"btnOk": "Confirm",
"btnCancel": "Cancel",
"deleteConfirmSingle": "Are you sure you want to delete this item?",
"deleteConfirmSelected": "Are you sure you want to delete the selected {n} items?",
"deleteSuccess": "Deleted",
"operationSuccess": "Success",
"selectRowsToDelete": "Please select rows to delete",
"selectAtLeastOne": "Please select at least one item",
"clearCacheSuccess": "Cache cleared",
"copySuccess": "Copied",
"copyFail": "Copy failed, please copy manually",
"uploadSuccess": "Uploaded",
"uploadFail": "Upload failed",
"downloadTemplateFail": "Failed to download template",
"importSuccess": "Imported",
"importFail": "Import failed",
"exportFail": "Export failed",
"exportSuccess": "Exported"
,
"exportNotConfigured": "Export API is not configured",
"exportPromptFileName": "Please enter export file name",
"exportFileNameRequired": "File name is required",
"clearCacheSelect": "Please select a cache to clear",
"clearCacheTitle": "Clear selected cache",
"clearCacheConfirmByTag": "Are you sure you want to clear cache for tag: {tag}?"
,
"saipackageWebBuildTitle": "Frontend build & publish",
"saipackageWebBuildConfirm": "Rebuild frontend and publish the project?",
"saipackageWebBuildSuccess": "Frontend built and published",
"saipackageFrontendDepsTitle": "Frontend dependencies",
"saipackageFrontendDepsConfirm": "Update frontend Node dependencies?",
"saipackageFrontendDepsSuccess": "Frontend dependencies updated",
"saipackageComposerTitle": "Composer dependencies",
"saipackageComposerConfirm": "Update backend Composer packages?",
"saipackageComposerSuccess": "Composer packages updated"
},
"form": { "form": {
"placeholderInput": "Please enter", "placeholderInput": "Please enter",
"placeholderSelect": "Please select", "placeholderSelect": "Please select",
@@ -361,6 +401,7 @@
"dice": { "dice": {
"title": "Dice Game", "title": "Dice Game",
"lotteryPoolConfig": "Lottery Tier Weight Config", "lotteryPoolConfig": "Lottery Tier Weight Config",
"anteConfig": "Ante Config",
"player": "Player Management", "player": "Player Management",
"playerWalletRecord": "Player Wallet Records", "playerWalletRecord": "Player Wallet Records",
"playRecord": "Player Draw Records", "playRecord": "Player Draw Records",

View File

@@ -0,0 +1,37 @@
{
"search": {
"name": "Name",
"title": "Title",
"isDefault": "Default",
"placeholderName": "Please enter name",
"placeholderTitle": "Please enter title",
"placeholderIsDefault": "Please select default status"
},
"table": {
"id": "ID",
"name": "Name",
"title": "Title",
"mult": "Ante Multiplier",
"isDefault": "Default Ante",
"defaultYes": "Yes",
"defaultNo": "No",
"createTime": "Create Time",
"updateTime": "Update Time"
},
"form": {
"titleAdd": "Add Ante Config",
"titleEdit": "Edit Ante Config",
"labelName": "Name",
"labelTitle": "Title",
"labelMult": "Ante Multiplier",
"labelIsDefault": "Default Ante",
"placeholderName": "Please enter name",
"placeholderTitle": "Please enter title",
"ruleNameRequired": "Please enter name",
"ruleTitleRequired": "Please enter title",
"ruleMultRequired": "Please enter ante multiplier",
"ruleDefaultRequired": "Please select default status",
"addSuccess": "Added successfully",
"editSuccess": "Updated successfully"
}
}

View File

@@ -23,7 +23,7 @@
"poolName": "Pool Name", "poolName": "Pool Name",
"playerProfit": "Player Total Profit (profit_amount):", "playerProfit": "Player Total Profit (profit_amount):",
"realtime": "Live", "realtime": "Live",
"profitCalcHint": "Sum of (win amount including BIGWIN minus 100 ticket cost) per round; refreshes every 2s while open.", "profitCalcHint": "Profit per round: paid = win_coin (incl. BIGWIN) - paid_amount (= ante×1); free = win_coin. Refreshes every 2s while open.",
"tierRuleTitle": "Tier Rule", "tierRuleTitle": "Tier Rule",
"tierRuleContent": "When player profit in this pool is below safety line, use player T*_weight; when above or equal, use pool T*_weight (kill).", "tierRuleContent": "When player profit in this pool is below safety line, use player T*_weight; when above or equal, use pool T*_weight (kill).",
"killScoreWeights": "Kill weights", "killScoreWeights": "Kill weights",

View File

@@ -30,8 +30,8 @@
"rollArrayHint": "5 numbers, each 16", "rollArrayHint": "5 numbers, each 16",
"rollNumber": "Roll Sum", "rollNumber": "Roll Sum",
"placeholderRollNumber": "Sum of 5 dice (530)", "placeholderRollNumber": "Sum of 5 dice (530)",
"rewardConfig": "Reward Config", "rewardTier": "Reward Tier",
"placeholderRewardConfig": "Select reward config (by UI text)", "placeholderRewardTier": "Select reward tier",
"addSuccess": "Added successfully", "addSuccess": "Added successfully",
"editSuccess": "Updated successfully", "editSuccess": "Updated successfully",
"validateFailed": "Validation failed, please check required fields and format" "validateFailed": "Validation failed, please check required fields and format"
@@ -47,8 +47,8 @@
"direction": "Direction", "direction": "Direction",
"winCoin": "Win Coin", "winCoin": "Win Coin",
"rollNumber": "Roll Number", "rollNumber": "Roll Number",
"rewardConfig": "Reward Config",
"rewardTier": "Reward Tier", "rewardTier": "Reward Tier",
"rewardConfig": "Reward Config",
"usernameFuzzy": "Username (fuzzy)", "usernameFuzzy": "Username (fuzzy)",
"nameFuzzy": "Name (fuzzy)", "nameFuzzy": "Name (fuzzy)",
"uiTextFuzzy": "UI Text (fuzzy)", "uiTextFuzzy": "UI Text (fuzzy)",
@@ -64,6 +64,8 @@
"player": "Player", "player": "Player",
"lotteryPoolConfig": "Lottery Pool Config", "lotteryPoolConfig": "Lottery Pool Config",
"drawType": "Draw Type", "drawType": "Draw Type",
"ante": "Ante",
"paidAmount": "Paid Amount",
"isBigWin": "Is Big Win", "isBigWin": "Is Big Win",
"winCoin": "Win Coin", "winCoin": "Win Coin",
"superWinCoin": "Super Win Coin", "superWinCoin": "Super Win Coin",
@@ -73,7 +75,7 @@
"targetIndex": "Target Index", "targetIndex": "Target Index",
"rollArray": "Roll Array", "rollArray": "Roll Array",
"rollNumber": "Roll Number", "rollNumber": "Roll Number",
"rewardConfig": "Reward Config", "rewardTier": "Reward Tier",
"createTime": "Create Time", "createTime": "Create Time",
"updateTime": "Update Time" "updateTime": "Update Time"
} }

View File

@@ -4,10 +4,13 @@
"platformTotalProfit": "Platform Total Profit" "platformTotalProfit": "Platform Total Profit"
}, },
"search": { "search": {
"rewardConfigRecordId": "Weight Test Record ID",
"drawType": "Draw Type", "drawType": "Draw Type",
"direction": "Direction", "direction": "Direction",
"isBigWin": "Is Big Win", "isBigWin": "Is Big Win",
"winCoin": "Win Coin", "winCoin": "Win Coin",
"paidAmount": "Paid Amount",
"ante": "Ante",
"rewardTier": "Reward Tier", "rewardTier": "Reward Tier",
"rollNumber": "Roll Number", "rollNumber": "Roll Number",
"paid": "Paid", "paid": "Paid",
@@ -19,10 +22,13 @@
}, },
"table": { "table": {
"id": "ID", "id": "ID",
"rewardConfigRecordId": "Weight Test Record ID",
"player": "Player", "player": "Player",
"lotteryPoolConfig": "Lottery Pool Config", "lotteryPoolConfig": "Lottery Pool Config",
"drawType": "Draw Type", "drawType": "Draw Type",
"isBigWin": "Is Big Win", "isBigWin": "Is Big Win",
"paidAmount": "Paid Amount",
"ante": "Ante",
"winCoin": "Win Coin", "winCoin": "Win Coin",
"superWinCoin": "Super Win Coin", "superWinCoin": "Super Win Coin",
"rewardWinCoin": "Reward Win Coin", "rewardWinCoin": "Reward Win Coin",
@@ -31,7 +37,8 @@
"targetIndex": "Target Index", "targetIndex": "Target Index",
"rollArray": "Roll Array", "rollArray": "Roll Array",
"rollNumber": "Roll Number", "rollNumber": "Roll Number",
"rewardConfig": "Reward Config", "rewardTier": "Reward Tier",
"status": "Status",
"createTime": "Create Time" "createTime": "Create Time"
}, },
"form": { "form": {
@@ -40,9 +47,7 @@
"labelLotteryConfigId": "Lottery Config ID", "labelLotteryConfigId": "Lottery Config ID",
"placeholderLotteryConfigId": "Please enter lottery config id", "placeholderLotteryConfigId": "Please enter lottery config id",
"placeholderWinCoin": "Win coin", "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", "placeholderStartIndex": "Please enter start index",
"labelTargetIndex": "Target Index", "labelTargetIndex": "Target Index",
"placeholderTargetIndex": "Please enter target index", "placeholderTargetIndex": "Please enter target index",
@@ -58,9 +63,14 @@
"ruleDrawTypeRequired": "Draw type is required", "ruleDrawTypeRequired": "Draw type is required",
"ruleIsBigWinRequired": "Is big win is required", "ruleIsBigWinRequired": "Is big win is required",
"ruleDirectionRequired": "Direction is required", "ruleDirectionRequired": "Direction is required",
"ruleRewardConfigIdRequired": "Reward config id is required", "ruleRewardTierRequired": "Reward tier is required",
"ruleStatusRequired": "Status is required", "ruleStatusRequired": "Status is required",
"addSuccess": "Added successfully", "addSuccess": "Added successfully",
"editSuccess": "Updated successfully" "editSuccess": "Updated successfully"
},
"ui": {
"clearAllConfirm": "Are you sure you want to clear all player draw test data?",
"clearAllSuccess": "All test data cleared",
"clearAllFail": "Clear failed"
} }
} }

View File

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

View File

@@ -19,6 +19,7 @@
"search": { "search": {
"player": "Player", "player": "Player",
"useCoins": "Use Coins", "useCoins": "Use Coins",
"ante": "Ante",
"totalDrawCount": "Total Draw Count", "totalDrawCount": "Total Draw Count",
"paidDrawCount": "Paid Draw Count", "paidDrawCount": "Paid Draw Count",
"freeDrawCount": "Free Draw Count", "freeDrawCount": "Free Draw Count",
@@ -29,6 +30,7 @@
"id": "ID", "id": "ID",
"playerUsername": "Player Username", "playerUsername": "Player Username",
"useCoins": "Use Coins", "useCoins": "Use Coins",
"ante": "Ante",
"totalDrawCount": "Total Draw Count", "totalDrawCount": "Total Draw Count",
"paidDrawCount": "Paid Draw Count", "paidDrawCount": "Paid Draw Count",
"freeDrawCount": "Free Draw Count", "freeDrawCount": "Free Draw Count",

View File

@@ -56,11 +56,19 @@
"weightTest": { "weightTest": {
"title": "One-Click Weight Test", "title": "One-Click Weight Test",
"alertTitle": "Bonus pool logic", "alertTitle": "Bonus pool logic",
"alertBody": "Same as playStart draw: uses name=default safety line and kill switch; when profit is below the line, paid tickets use player tier weights (custom below), free tickets use killScore; when profit reaches the line and kill is on, both use killScore.", "alertBody": "Test mode is non-kill by default. You can enable kill mode below with switch + safety line: once simulated player cumulative profit reaches the line, paid draws switch to killScore.",
"chainModeHint": "Simulation: set paid spin counts only (CW/CCW). If a paid draw hits “play again” (or T5), the next draw is free with the same ante, lottery type free, paid amount 0. Free-draw tier odds are configured below (including chained free plays).",
"killModeHint": "When test kill mode is enabled: use simulated player cumulative profit as trigger; once cumulative profit >= safety line, subsequent paid draws use killScore. Free draws still follow the configured free settings.",
"labelKillModeEnabled": "Enable test kill mode",
"labelTestSafetyLine": "Test safety line",
"sectionPaid": "Paid draws",
"sectionFreeAfterPlayAgain": "Free draw tier odds (after play-again)",
"tierProbHintFreeChain": "When using custom tier odds: T1T5 below apply when a free draw runs (tier roll; combined with dice_reward row weights).",
"stepPaid": "Paid ticket", "stepPaid": "Paid ticket",
"stepFree": "Free ticket", "stepFree": "Free ticket",
"labelLotteryTypePaid": "Test pool type", "labelLotteryTypePaid": "Test pool type",
"labelLotteryTypeFree": "Test pool type", "labelLotteryTypeFree": "Test pool type",
"labelAnte": "Ante",
"placeholderPaidPool": "Leave empty for custom tier odds below (default: default)", "placeholderPaidPool": "Leave empty for custom tier odds below (default: default)",
"placeholderFreePool": "Leave empty for custom tier odds below (default: killScore)", "placeholderFreePool": "Leave empty for custom tier odds below (default: killScore)",
"tierProbHint": "Custom tier odds (T1T5), each 0100%, sum of five must not exceed 100%", "tierProbHint": "Custom tier odds (T1T5), each 0100%, sum of five must not exceed 100%",
@@ -73,6 +81,9 @@
"btnNext": "Next", "btnNext": "Next",
"btnStart": "Start test", "btnStart": "Start test",
"btnCancel": "Cancel", "btnCancel": "Cancel",
"warnAnte": "Ante must be greater than 0",
"warnPaidSpins": "Paid clockwise + counter-clockwise spin counts must be greater than 0",
"warnTestSafetyLine": "Test safety line must be greater than or equal to 0",
"warnTotalSpins": "At least one of paid/free direction spin counts must be greater than 0", "warnTotalSpins": "At least one of paid/free direction spin counts must be greater than 0",
"warnPaidTierSumPositive": "When no paid pool is selected, T1T5 odds sum must be greater than 0", "warnPaidTierSumPositive": "When no paid pool is selected, T1T5 odds sum must be greater than 0",
"warnPaidTierSumMax": "Paid T1T5 odds sum cannot exceed 100%", "warnPaidTierSumMax": "Paid T1T5 odds sum cannot exceed 100%",

View File

@@ -14,6 +14,7 @@
"colDisplayText": "Display Text", "colDisplayText": "Display Text",
"colDisplayTextEn": "Display Text (EN)", "colDisplayTextEn": "Display Text (EN)",
"colRealEv": "Real Settlement", "colRealEv": "Real Settlement",
"colRealReward": "Player Real Reward",
"colTier": "Tier", "colTier": "Tier",
"colRemark": "Remark", "colRemark": "Remark",
"placeholderTierSelect": "Tier", "placeholderTierSelect": "Tier",
@@ -50,7 +51,50 @@
"warnDupGrid": "Duplicate dice points in this table: {list}", "warnDupGrid": "Duplicate dice points in this table: {list}",
"warnNoBigwinToSave": "No BIGWIN rows to save", "warnNoBigwinToSave": "No BIGWIN rows to save",
"warnBigwinDupGrid": "Duplicate big-win points in this table: {list}", "warnBigwinDupGrid": "Duplicate big-win points in this table: {list}",
"infoNoBigwin": "No BIGWIN rows. Set tier to BIGWIN in the Reward Index tab first." "infoNoBigwin": "No BIGWIN rows. Set tier to BIGWIN in the Reward Index tab first.",
"btnRuleGenerate": "Generate by rules",
"ruleGenerateTitle": "Generate reward index by rules",
"ruleGenerateRules": "[Generation logic (same as Create Reward Reference)]\n• 26 cells ordered by id ascending are positions 025; each rows grid_number is 530 and unique.\n• Roll D (530): start at the cell whose grid_number equals D (start_index); clockwise landing = (start position + D) mod 26; counter-clockwise = start D (if negative, +26).\n• Each reference rows “dice points” column is the roll D; tier / real_ev / display text come from the config at the landing id.\n\n[Leopard rolls]\nFor rolls 5, 10, 15, 20, 25, 30, clockwise and counter-clockwise landing tiers must NOT be T4 or T5 (avoid leopard roll + penalty / once again).\n\n[Settlement amount vs tier]\nSettlement < 0 → T4; 0 < Settlement < 100 → T3; 100 < Settlement < 200 → T2; Settlement > 200 → T1; T5 “once again” settlement = 0. You can set a unified settlement standard for each tier below; generated rows write those values into the config, and details can be edited later in the table.\n\n[Inputs in this dialog]\nCount: T1/T4/T5 are fixed; T2 is minimum. Clockwise and counter-clockwise weighted counts (each roll result counts once) must each satisfy the entered values; T1, T4, and T5 are entered separately.\nSettlement standard: all cells in the same tier use the same value. On generation, T1T4 use ui_text / ui_text_en = settlement real_ev; T5 is fixed to \"再来一次\" / \"Once again\". Remarks still distinguish break-even / small win, etc.",
"ruleGenT1Row": "T1 (big prize)",
"ruleGenT2Row": "T2 (small win / break-even)",
"ruleGenT3RealEvOnly": "T3 (rake)",
"ruleGenT4Row": "T4 (penalty)",
"ruleGenT5Row": "T5 (try again)",
"ruleGenMinCount": "Min count",
"ruleGenFixedCount": "Fixed count (CW & CCW)",
"ruleGenRealEvStd": "real_ev standard",
"ruleGenRealEvEditHint": "After saving, you can still edit display text, EN, real_ev and remarks per row in the table above.",
"ruleGenInvalidT1RealEv": "T1 settlement amount must satisfy: value > 200",
"ruleGenInvalidT2RealEv": "T2 settlement amount must satisfy: 100 < value < 200",
"ruleGenInvalidT3RealEv": "T3 settlement amount must satisfy: 0 < value < 100",
"ruleGenInvalidT4RealEv": "T4 settlement amount must satisfy: value < 0",
"ruleGenInvalidT5RealEv": "T5 “try again” real_ev must be 0",
"ruleGenT1Min": "T1 fixed count (CW & CCW)",
"ruleGenT2Min": "T2 min (CW & CCW)",
"ruleGenT4Max": "T4 fixed count (CW & CCW)",
"ruleGenT5Max": "T5 fixed count (CW & CCW)",
"ruleGenScopeHint": "T1/T4/T5 are exact; T2 is minimum: clockwise and counter-clockwise weighted counts must satisfy each constraint.",
"ruleGenApply": "Generate and save",
"ruleGenNeedFullGrid": "Missing id 025 rows or incomplete grid_number; cannot generate",
"ruleGenFreqFail": "Cannot compute board frequencies; check grid_number",
"ruleGenUnknownId": "Unknown reward index id: {id}",
"ruleGenSuccess": "Generated and saved. Clockwise weighted: T1={cwT1} T2={cwT2} T4={cwT4} T5={cwT5}; counter-clockwise: T1={ccT1} T2={ccT2} T4={ccT4} T5={ccT5}",
"btnJsonImport": "JSON import",
"jsonImportTitle": "Reward index JSON import",
"jsonImportHint": "Current Reward Index rows (excluding BIGWIN) are filled below. Edit and submit; id must be 025, grid_number must be 530. Submit applies to the table and saves.",
"jsonImportParseFail": "Invalid JSON",
"jsonImportNotArray": "Root must be a JSON array",
"jsonImportItemInvalid": "Item {n} is not a valid object",
"jsonImportMissingField": "Item {n} is missing field: {field}",
"jsonImportIdRange": "id must be 025; item {n} has {v}",
"jsonImportGridRange": "grid_number must be 530; item {n} has {v}",
"jsonImportDupId": "Duplicate id in JSON: {list}",
"jsonImportDupGrid": "Duplicate grid_number in JSON: {list}",
"jsonImportFullIdSet": "For 26 rows, id must be exactly 025 once each",
"jsonImportFullGridSet": "For 26 rows, grid_number must be exactly 530 once each",
"jsonImportUnknownId": "Unknown id: {id} (export from the current list first)",
"jsonImportTierInvalid": "Invalid tier at item {n}",
"jsonImportEmpty": "Nothing to submit"
}, },
"weightRatio": { "weightRatio": {
"title": "T1T5 Weight Ratio (Clockwise / Counter-clockwise)", "title": "T1T5 Weight Ratio (Clockwise / Counter-clockwise)",

View File

@@ -2,16 +2,28 @@
"toolbar": { "toolbar": {
"viewDetail": "View Detail" "viewDetail": "View Detail"
}, },
"search": {
"paidPlannedSpins": "Planned paid spins",
"ante": "Ante"
},
"table": { "table": {
"id": "ID", "id": "ID",
"clockwiseAbbr": "CW", "clockwiseAbbr": "CW",
"counterclockwiseAbbr": "CCW", "counterclockwiseAbbr": "CCW",
"status": "Status", "status": "Status",
"paidDraw": "Paid Draw", "paidDraw": "Paid Draw",
"freeDraw": "Free Draw", "chainMode": "Chain play-again",
"chainModeYes": "Yes",
"chainModeNo": "No",
"paidPlannedSpins": "Planned paid spins",
"ante": "Ante",
"playAgainCount": "Play-again count",
"progressDraws": "{over} done",
"progressFailed": "{over} before fail",
"platformProfit": "Platform Profit", "platformProfit": "Platform Profit",
"totalDrawCount": "Total Draw Count", "totalDrawCount": "Total draws",
"createdBy": "Created By", "createdBy": "Created By",
"remark": "Remark",
"createTime": "Create Time", "createTime": "Create Time",
"statusFail": "Failed", "statusFail": "Failed",
"statusDone": "Done", "statusDone": "Done",
@@ -36,6 +48,10 @@
"recordId": "Record ID", "recordId": "Record ID",
"testCount": "Test count", "testCount": "Test count",
"testCountSuffix": " runs", "testCountSuffix": " runs",
"testCountProgress": "In progress: {over} done",
"testCountFailed": "{over} before failure",
"chainModeLabel": "Chain play-again",
"paidPlannedSpins": "Planned paid spins",
"createTime": "Created at", "createTime": "Created at",
"admin": "Operator", "admin": "Operator",
"paidPoolId": "Paid lottery pool config ID", "paidPoolId": "Paid lottery pool config ID",

View File

@@ -47,5 +47,11 @@
"ruleRoleRequired": "Please select role", "ruleRoleRequired": "Please select role",
"addSuccess": "Added successfully", "addSuccess": "Added successfully",
"editSuccess": "Updated successfully" "editSuccess": "Updated successfully"
},
"ui": {
"promptNewPassword": "Please enter a new password",
"passwordLengthError": "Password length must be between 6 and 16",
"passwordChanged": "Password updated",
"clearCacheConfirm": "Are you sure you want to clear cache?"
} }
} }

View File

@@ -16,5 +16,16 @@
"tplCategory": "Gen Type", "tplCategory": "Gen Type",
"updateTime": "Update Time", "updateTime": "Update Time",
"createTime": "Create Time" "createTime": "Create Time"
},
"ui": {
"generating": "Generating code package, please wait...",
"generateSuccess": "Code generated, downloading...",
"downloadFail": "Download failed",
"syncConfirm": "Sync will overwrite the configured table structure. Continue?",
"syncSuccess": "Synced",
"generateToProjectConfirm": "Generate-to-project will overwrite existing files. Continue?",
"generateToProjectSuccess": "Generated to project",
"loadSuccess": "Loaded",
"copyToClipboard": "Code copied to clipboard"
} }
} }

View File

@@ -58,5 +58,11 @@
"ruleTargetRequired": "Target is required", "ruleTargetRequired": "Target is required",
"addSuccess": "Added successfully", "addSuccess": "Added successfully",
"editSuccess": "Updated successfully" "editSuccess": "Updated successfully"
},
"ui": {
"runTitle": "Run Task",
"runConfirm": "Are you sure you want to run task [{name}]?",
"runSuccess": "Task started",
"selectTaskFirst": "Please select a task first"
} }
} }

View File

@@ -39,6 +39,46 @@
"confirm": "确定", "confirm": "确定",
"logOutTips": "您是否要退出登录?" "logOutTips": "您是否要退出登录?"
}, },
"uiMsg": {
"titlePrompt": "提示",
"titleDelete": "删除数据",
"titleDeleteSelected": "删除选中数据",
"btnOk": "确定",
"btnCancel": "取消",
"deleteConfirmSingle": "确定要删除该数据吗?",
"deleteConfirmSelected": "确定要删除选中的 {n} 条数据吗?",
"deleteSuccess": "删除成功",
"operationSuccess": "操作成功",
"selectRowsToDelete": "请选择要删除的行",
"selectAtLeastOne": "至少要选择一条数据",
"clearCacheSuccess": "清理缓存成功",
"copySuccess": "复制成功",
"copyFail": "复制失败,请手动复制",
"uploadSuccess": "上传成功",
"uploadFail": "上传失败",
"downloadTemplateFail": "下载模板失败",
"importSuccess": "导入成功",
"importFail": "导入失败",
"exportFail": "导出失败",
"exportSuccess": "导出成功"
,
"exportNotConfigured": "未配置导出接口",
"exportPromptFileName": "请输入导出文件名称",
"exportFileNameRequired": "文件名不能为空",
"clearCacheSelect": "请选择要清理的缓存",
"clearCacheTitle": "清理选中缓存",
"clearCacheConfirmByTag": "确定要清理标签:【{tag}】的缓存吗?"
,
"saipackageWebBuildTitle": "前端打包发布",
"saipackageWebBuildConfirm": "确认重新打包前端并发布项目吗?",
"saipackageWebBuildSuccess": "前端打包发布成功",
"saipackageFrontendDepsTitle": "前端依赖更新",
"saipackageFrontendDepsConfirm": "确认更新前端Node依赖吗",
"saipackageFrontendDepsSuccess": "前端依赖更新成功",
"saipackageComposerTitle": "composer包更新",
"saipackageComposerConfirm": "确认更新后端composer包吗",
"saipackageComposerSuccess": "composer包更新成功"
},
"form": { "form": {
"placeholderInput": "请输入", "placeholderInput": "请输入",
"placeholderSelect": "请选择", "placeholderSelect": "请选择",
@@ -357,6 +397,7 @@
"dice": { "dice": {
"title": "大富翁-色子游戏", "title": "大富翁-色子游戏",
"lotteryPoolConfig": "彩金池配置", "lotteryPoolConfig": "彩金池配置",
"anteConfig": "底注配置",
"player": "玩家管理", "player": "玩家管理",
"playerWalletRecord": "玩家钱包记录", "playerWalletRecord": "玩家钱包记录",
"playRecord": "玩家抽奖记录", "playRecord": "玩家抽奖记录",

View File

@@ -0,0 +1,37 @@
{
"search": {
"name": "名称",
"title": "标题",
"isDefault": "是否默认",
"placeholderName": "请输入名称",
"placeholderTitle": "请输入标题",
"placeholderIsDefault": "请选择是否默认"
},
"table": {
"id": "ID",
"name": "名称",
"title": "标题",
"mult": "底注倍率",
"isDefault": "默认底注",
"defaultYes": "是",
"defaultNo": "否",
"createTime": "创建时间",
"updateTime": "更新时间"
},
"form": {
"titleAdd": "新增底注配置",
"titleEdit": "编辑底注配置",
"labelName": "名称",
"labelTitle": "标题",
"labelMult": "底注倍率",
"labelIsDefault": "默认底注",
"placeholderName": "请输入名称",
"placeholderTitle": "请输入标题",
"ruleNameRequired": "请输入名称",
"ruleTitleRequired": "请输入标题",
"ruleMultRequired": "请输入底注倍率",
"ruleDefaultRequired": "请选择是否默认底注",
"addSuccess": "新增成功",
"editSuccess": "修改成功"
}
}

View File

@@ -23,7 +23,7 @@
"poolName": "池子名称", "poolName": "池子名称",
"playerProfit": "玩家累计盈利profit_amount", "playerProfit": "玩家累计盈利profit_amount",
"realtime": "实时", "realtime": "实时",
"profitCalcHint": "计算方式:每局按“当前中奖金额(含超级大奖 BIGWIN减去抽奖券费用 100”累加弹窗打开期间每 2 秒自动刷新", "profitCalcHint": "计算方式:付费每局按“赢取平台币 win_coin含 BIGWIN减去付费金额 压注金额paid_amount= 压注倍数ante×1”累加免费每局按“玩家赢得平台币win_coin”累加弹窗打开期间每 2 秒自动刷新",
"tierRuleTitle": "抽奖档位规则", "tierRuleTitle": "抽奖档位规则",
"tierRuleContent": "当玩家在当前彩金池的累计盈利 低于安全线 时,按 玩家 的 T*_weight 权重抽取档位;当累计盈利 高于或等于安全线 时,按 当前彩金池 的 T*_weight 权重抽取档位(杀分)。", "tierRuleContent": "当玩家在当前彩金池的累计盈利 低于安全线 时,按 玩家 的 T*_weight 权重抽取档位;当累计盈利 高于或等于安全线 时,按 当前彩金池 的 T*_weight 权重抽取档位(杀分)。",
"killScoreWeights": "杀分权重", "killScoreWeights": "杀分权重",

View File

@@ -8,7 +8,7 @@
"placeholderLotteryPool": "请选择彩金池配置", "placeholderLotteryPool": "请选择彩金池配置",
"drawType": "抽奖类型", "drawType": "抽奖类型",
"paid": "付费", "paid": "付费",
"free": "赠送", "free": "免费",
"isBigWin": "是否中大奖", "isBigWin": "是否中大奖",
"noBigWin": "无", "noBigWin": "无",
"bigWin": "中大奖", "bigWin": "中大奖",
@@ -30,8 +30,8 @@
"rollArrayHint": "固定 5 个数,每个 16", "rollArrayHint": "固定 5 个数,每个 16",
"rollNumber": "摇取点数和", "rollNumber": "摇取点数和",
"placeholderRollNumber": "5 个色子点数之和530", "placeholderRollNumber": "5 个色子点数之和530",
"rewardConfig": "奖励配置", "rewardTier": "中奖档位",
"placeholderRewardConfig": "请选择奖励配置(显示前端文本)", "placeholderRewardTier": "请选择中奖档位",
"addSuccess": "新增成功", "addSuccess": "新增成功",
"editSuccess": "修改成功", "editSuccess": "修改成功",
"validateFailed": "表单验证失败,请检查必填项与格式" "validateFailed": "表单验证失败,请检查必填项与格式"
@@ -47,13 +47,13 @@
"direction": "方向", "direction": "方向",
"winCoin": "赢取平台币", "winCoin": "赢取平台币",
"rollNumber": "摇取点数和", "rollNumber": "摇取点数和",
"rewardTier": "中奖档位",
"rewardConfig": "奖励配置", "rewardConfig": "奖励配置",
"rewardTier": "奖励档位",
"usernameFuzzy": "用户名模糊", "usernameFuzzy": "用户名模糊",
"nameFuzzy": "名称模糊", "nameFuzzy": "名称模糊",
"uiTextFuzzy": "前端显示文本模糊", "uiTextFuzzy": "前端显示文本模糊",
"paid": "付费", "paid": "付费",
"free": "赠送", "free": "免费",
"noBigWin": "无", "noBigWin": "无",
"bigWin": "中大奖", "bigWin": "中大奖",
"clockwise": "顺时针", "clockwise": "顺时针",
@@ -64,6 +64,8 @@
"player": "玩家", "player": "玩家",
"lotteryPoolConfig": "彩金池配置", "lotteryPoolConfig": "彩金池配置",
"drawType": "抽奖类型", "drawType": "抽奖类型",
"ante": "注数",
"paidAmount": "付费金额",
"isBigWin": "是否中大奖", "isBigWin": "是否中大奖",
"winCoin": "赢取平台币", "winCoin": "赢取平台币",
"superWinCoin": "中大奖平台币", "superWinCoin": "中大奖平台币",
@@ -73,7 +75,7 @@
"targetIndex": "终点索引", "targetIndex": "终点索引",
"rollArray": "摇取点数", "rollArray": "摇取点数",
"rollNumber": "摇取点数和", "rollNumber": "摇取点数和",
"rewardConfig": "奖励配置", "rewardTier": "中奖档位",
"createTime": "创建时间", "createTime": "创建时间",
"updateTime": "更新时间" "updateTime": "更新时间"
} }

View File

@@ -4,14 +4,17 @@
"platformTotalProfit": "平台总盈利" "platformTotalProfit": "平台总盈利"
}, },
"search": { "search": {
"rewardConfigRecordId": "测试记录ID",
"drawType": "抽奖类型", "drawType": "抽奖类型",
"direction": "方向", "direction": "方向",
"isBigWin": "是否中大奖", "isBigWin": "是否中大奖",
"winCoin": "赢取平台币", "winCoin": "赢取平台币",
"rewardTier": "奖励档位", "paidAmount": "付费金额",
"ante": "底注",
"rewardTier": "中奖档位",
"rollNumber": "摇取点数和", "rollNumber": "摇取点数和",
"paid": "付费", "paid": "付费",
"free": "赠送", "free": "免费",
"clockwise": "顺时针", "clockwise": "顺时针",
"anticlockwise": "逆时针", "anticlockwise": "逆时针",
"noBigWin": "无", "noBigWin": "无",
@@ -19,10 +22,13 @@
}, },
"table": { "table": {
"id": "ID", "id": "ID",
"rewardConfigRecordId": "测试记录ID",
"player": "玩家", "player": "玩家",
"lotteryPoolConfig": "彩金池配置", "lotteryPoolConfig": "彩金池配置",
"drawType": "抽奖类型", "drawType": "抽奖类型",
"isBigWin": "是否中大奖", "isBigWin": "是否中大奖",
"paidAmount": "付费金额",
"ante": "底注",
"winCoin": "赢取平台币", "winCoin": "赢取平台币",
"superWinCoin": "中大奖平台币", "superWinCoin": "中大奖平台币",
"rewardWinCoin": "摇色子中奖平台币", "rewardWinCoin": "摇色子中奖平台币",
@@ -31,7 +37,8 @@
"targetIndex": "终点索引", "targetIndex": "终点索引",
"rollArray": "摇取点数", "rollArray": "摇取点数",
"rollNumber": "摇取点数和", "rollNumber": "摇取点数和",
"rewardConfig": "奖励配置", "rewardTier": "中奖档位",
"status": "状态",
"createTime": "创建时间" "createTime": "创建时间"
}, },
"form": { "form": {
@@ -40,9 +47,7 @@
"labelLotteryConfigId": "彩金池配置id", "labelLotteryConfigId": "彩金池配置id",
"placeholderLotteryConfigId": "请输入彩金池配置id", "placeholderLotteryConfigId": "请输入彩金池配置id",
"placeholderWinCoin": "赢取平台币", "placeholderWinCoin": "赢取平台币",
"placeholderRewardTier": "请选择档位(选后自动带出奖励配置ID)", "placeholderRewardTier": "请选择中奖档位",
"rewardConfigId": "奖励配置id",
"placeholderRewardConfigId": "可选中奖档位自动带出或手动输入",
"placeholderStartIndex": "请输入起始索引", "placeholderStartIndex": "请输入起始索引",
"labelTargetIndex": "结束索引", "labelTargetIndex": "结束索引",
"placeholderTargetIndex": "请输入结束索引", "placeholderTargetIndex": "请输入结束索引",
@@ -58,9 +63,14 @@
"ruleDrawTypeRequired": "抽奖类型必需填写", "ruleDrawTypeRequired": "抽奖类型必需填写",
"ruleIsBigWinRequired": "是否中大奖必需填写", "ruleIsBigWinRequired": "是否中大奖必需填写",
"ruleDirectionRequired": "方向必需填写", "ruleDirectionRequired": "方向必需填写",
"ruleRewardConfigIdRequired": "奖励配置id必需填写", "ruleRewardTierRequired": "中奖档位必需填写",
"ruleStatusRequired": "状态必需填写", "ruleStatusRequired": "状态必需填写",
"addSuccess": "新增成功", "addSuccess": "新增成功",
"editSuccess": "修改成功" "editSuccess": "修改成功"
},
"ui": {
"clearAllConfirm": "确定清空所有玩家抽奖测试数据?",
"clearAllSuccess": "已清空所有测试数据",
"clearAllFail": "清空失败"
} }
} }

View File

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

View File

@@ -19,6 +19,7 @@
"search": { "search": {
"player": "玩家", "player": "玩家",
"useCoins": "消耗硬币", "useCoins": "消耗硬币",
"ante": "底注",
"totalDrawCount": "总抽奖次数", "totalDrawCount": "总抽奖次数",
"paidDrawCount": "购买抽奖次数", "paidDrawCount": "购买抽奖次数",
"freeDrawCount": "赠送抽奖次数", "freeDrawCount": "赠送抽奖次数",
@@ -29,6 +30,7 @@
"id": "ID", "id": "ID",
"playerUsername": "玩家用户名", "playerUsername": "玩家用户名",
"useCoins": "消耗硬币", "useCoins": "消耗硬币",
"ante": "底注",
"totalDrawCount": "总抽奖次数", "totalDrawCount": "总抽奖次数",
"paidDrawCount": "购买抽奖次数", "paidDrawCount": "购买抽奖次数",
"freeDrawCount": "赠送抽奖次数", "freeDrawCount": "赠送抽奖次数",

View File

@@ -56,11 +56,19 @@
"weightTest": { "weightTest": {
"title": "一键测试权重", "title": "一键测试权重",
"alertTitle": "彩金池逻辑说明", "alertTitle": "彩金池逻辑说明",
"alertBody": "与 playStart 抽奖逻辑一致:使用 name=default 的安全线、杀分开关;盈利未达安全线时,付费抽奖券使用玩家自身权重(下方自定义档位),免费抽奖券使用 killScore 配置;盈利达到安全线且杀分开启时,付费/免费均使用 killScore 配置。", "alertBody": "测试模式默认不启用杀分切换;可通过下方“杀分开关 + 安全线”在测试内启用:当模拟玩家累计盈利达到安全线后,付费抽奖切换到 killScore。",
"chainModeHint": "模拟方式:只配置付费抽奖次数(顺/逆时针)。付费抽到「再来一次」或 T5 时,下一局自动为免费抽奖,底注与触发局相同,抽奖类型记为免费、付费金额记为 0。免费抽奖的档位概率由下方「免费抽奖」配置决定含通过再来一次触发的后续免费局。",
"killModeHint": "杀分开关开启后:以“模拟玩家累计盈利”作为判定值;当累计盈利 >= 安全线时,后续付费抽奖按 killScore 配置抽取;免费抽奖仍按“免费抽奖配置”执行。",
"labelKillModeEnabled": "开启测试内杀分",
"labelTestSafetyLine": "测试安全线",
"sectionPaid": "付费抽奖",
"sectionFreeAfterPlayAgain": "免费抽奖(再来一次后的档位概率)",
"tierProbHintFreeChain": "当使用自定义档位时:以下为「免费抽奖」时 T1T5 的档位概率(仅在有免费局时参与摇档,与 dice_reward 格子权重共同决定结果)。",
"stepPaid": "付费抽奖券", "stepPaid": "付费抽奖券",
"stepFree": "免费抽奖券", "stepFree": "免费抽奖券",
"labelLotteryTypePaid": "测试数据档位类型", "labelLotteryTypePaid": "测试数据档位类型",
"labelLotteryTypeFree": "测试数据档位类型", "labelLotteryTypeFree": "测试数据档位类型",
"labelAnte": "底注 ante",
"placeholderPaidPool": "不选则下方自定义档位概率(默认 default", "placeholderPaidPool": "不选则下方自定义档位概率(默认 default",
"placeholderFreePool": "不选则下方自定义档位概率(默认 killScore", "placeholderFreePool": "不选则下方自定义档位概率(默认 killScore",
"tierProbHint": "自定义档位概率T1T5每档 0-100%,五档之和不能超过 100%", "tierProbHint": "自定义档位概率T1T5每档 0-100%,五档之和不能超过 100%",
@@ -73,6 +81,9 @@
"btnNext": "下一步", "btnNext": "下一步",
"btnStart": "开始测试", "btnStart": "开始测试",
"btnCancel": "取消", "btnCancel": "取消",
"warnAnte": "底注 ante 必须大于 0",
"warnPaidSpins": "付费抽奖顺时针与逆时针次数之和须大于 0",
"warnTestSafetyLine": "测试安全线必须大于或等于 0",
"warnTotalSpins": "付费或免费至少一种方向次数之和大于 0", "warnTotalSpins": "付费或免费至少一种方向次数之和大于 0",
"warnPaidTierSumPositive": "付费未选奖池时T1T5 档位概率之和需大于 0", "warnPaidTierSumPositive": "付费未选奖池时T1T5 档位概率之和需大于 0",
"warnPaidTierSumMax": "付费档位概率 T1T5 之和不能超过 100%", "warnPaidTierSumMax": "付费档位概率 T1T5 之和不能超过 100%",

View File

@@ -13,7 +13,8 @@
"colDicePoints": "色子点数", "colDicePoints": "色子点数",
"colDisplayText": "显示文本", "colDisplayText": "显示文本",
"colDisplayTextEn": "显示文本(英文)", "colDisplayTextEn": "显示文本(英文)",
"colRealEv": "真实结算", "colRealEv": "结算金额",
"colRealReward": "玩家实际中奖",
"colTier": "所属档位", "colTier": "所属档位",
"colRemark": "备注", "colRemark": "备注",
"placeholderTierSelect": "档位", "placeholderTierSelect": "档位",
@@ -50,7 +51,50 @@
"warnDupGrid": "色子点数在本表内不能重复,重复的点数为:{list}", "warnDupGrid": "色子点数在本表内不能重复,重复的点数为:{list}",
"warnNoBigwinToSave": "暂无 BIGWIN 档位配置可保存", "warnNoBigwinToSave": "暂无 BIGWIN 档位配置可保存",
"warnBigwinDupGrid": "大奖权重本表内点数不能重复,重复的点数为:{list}", "warnBigwinDupGrid": "大奖权重本表内点数不能重复,重复的点数为:{list}",
"infoNoBigwin": "暂无 BIGWIN 档位配置,请先在「奖励索引」中设置 tier 为 BIGWIN" "infoNoBigwin": "暂无 BIGWIN 档位配置,请先在「奖励索引」中设置 tier 为 BIGWIN",
"btnRuleGenerate": "按规则生成",
"ruleGenerateTitle": "按规则生成奖励索引",
"ruleGenerateRules": "【生成逻辑(与创建奖励对照一致)】\n• 盘面 26 格按 id 升序为位置 025每条配置的 grid_number 为 530 且不重复。\n• 摇取点数 D530起点为「grid_number=D」所在格位的 id即 start_index顺时针落点位置 = (起点位置 + D) mod 26逆时针落点 = 起点位置 D若小于 0 则 +26。\n• 对照表每条记录的「色子点数」列为摇取点数 D档位、真实结算、显示文案取自落点格位对应 id 的配置。\n\n【豹子摇取点数】\n摇取点数为 5、10、15、20、25、30 时,其顺/逆时针落点档位不能为 T4、T5避免对照表上出现豹子点数 + 惩罚/再来一次)。\n\n【结算金额 与 档位】\n结算金额 < 0 → T40 < 结算金额 < 100 → T3100 < 结算金额 < 200 → T2200 < 结算金额 → T1T5「再来一次」结算金额=0。下方可为各档位填写统一的 结算金额 标准,生成时写入配置;细则可稍后在表格中再改。\n\n【本弹窗输入】\n条数T1/T4/T5「固定」T2「不少于」——顺时针与逆时针的加权条数每条摇取结果计一次须分别满足所填数值T1、T4 与 T5 分开填写。\n结算金额 标准:同档位各格使用同一数值。生成时 T1T4 的 显示文本 / 显示文本(英文) = 结算金额T5 固定为「再来一次」/「Once again」。备注仍区分完美回本/小赚等。",
"ruleGenT1Row": "T1 大奖",
"ruleGenT2Row": "T2 小赚/回本",
"ruleGenT3RealEvOnly": "T3 抽水",
"ruleGenT4Row": "T4 惩罚",
"ruleGenT5Row": "T5 再来一次",
"ruleGenMinCount": "最少条数",
"ruleGenFixedCount": "固定条数(顺/逆)",
"ruleGenRealEvStd": "结算金额",
"ruleGenRealEvEditHint": "生成并保存后,仍可在本页表格中逐条修改显示文案、英文、真实结算与备注。",
"ruleGenInvalidT1RealEv": "T1 的 结算金额 满足200 < 值",
"ruleGenInvalidT2RealEv": "T2 的 结算金额 满足100 < 值 < 200",
"ruleGenInvalidT3RealEv": "T3 的 结算金额 满足0 < 值 < 100",
"ruleGenInvalidT4RealEv": "T4 的 结算金额 满足:值 < 0",
"ruleGenInvalidT5RealEv": "T5「再来一次」的 结算金额 须为 0",
"ruleGenT1Min": "T1 固定条数(顺/逆)",
"ruleGenT2Min": "T2 最少条数(顺/逆)",
"ruleGenT4Max": "T4 固定条数(顺/逆)",
"ruleGenT5Max": "T5 固定条数(顺/逆)",
"ruleGenScopeHint": "T1/T4/T5 为「恰好」T2 为「不少于」:顺时针与逆时针加权条数须分别满足对应约束。",
"ruleGenApply": "生成并保存",
"ruleGenNeedFullGrid": "当前列表缺少 id 025 的奖励索引行或色子点数不完整,无法生成",
"ruleGenFreqFail": "无法计算盘面频率,请检查 grid_number",
"ruleGenUnknownId": "不存在奖励索引 id{id}",
"ruleGenSuccess": "已按规则生成并保存。顺时针加权T1={cwT1} T2={cwT2} T4={cwT4} T5={cwT5}逆时针加权T1={ccT1} T2={ccT2} T4={ccT4} T5={ccT5}",
"btnJsonImport": "JSON 导入",
"jsonImportTitle": "奖励索引 JSON 导入",
"jsonImportHint": "当前「奖励索引」表数据(不含 BIGWIN已填入下方可编辑后提交奖励索引 id 须为 025色子点数 grid_number 须为 530。提交后将写入表格并保存。",
"jsonImportParseFail": "JSON 解析失败,请检查格式",
"jsonImportNotArray": "JSON 根节点必须为数组",
"jsonImportItemInvalid": "第 {n} 项不是有效对象",
"jsonImportMissingField": "第 {n} 项缺少字段:{field}",
"jsonImportIdRange": "奖励索引 id 须为 025第 {n} 项为 {v}",
"jsonImportGridRange": "色子点数 grid_number 须为 530第 {n} 项为 {v}",
"jsonImportDupId": "JSON 内奖励索引 id 重复:{list}",
"jsonImportDupGrid": "JSON 内色子点数重复:{list}",
"jsonImportFullIdSet": "共 26 条时,奖励索引 id 必须且仅能各出现一次025",
"jsonImportFullGridSet": "共 26 条时色子点数必须且仅能各出现一次530",
"jsonImportUnknownId": "不存在奖励索引 id{id}(请从当前列表导出后编辑)",
"jsonImportTierInvalid": "第 {n} 项所属档位 tier 无效",
"jsonImportEmpty": "没有可提交的条目"
}, },
"weightRatio": { "weightRatio": {
"title": "T1-T5 权重配比(顺时针/逆时针)", "title": "T1-T5 权重配比(顺时针/逆时针)",

View File

@@ -2,16 +2,28 @@
"toolbar": { "toolbar": {
"viewDetail": "查看详情" "viewDetail": "查看详情"
}, },
"search": {
"paidPlannedSpins": "计划付费次数",
"ante": "底注"
},
"table": { "table": {
"id": "ID", "id": "ID",
"clockwiseAbbr": "顺", "clockwiseAbbr": "顺",
"counterclockwiseAbbr": "逆", "counterclockwiseAbbr": "逆",
"status": "状态", "status": "状态",
"paidDraw": "付费抽取", "paidDraw": "付费抽取",
"freeDraw": "免费抽取", "chainMode": "链式再来一次",
"chainModeYes": "是",
"chainModeNo": "否",
"paidPlannedSpins": "计划付费次数",
"ante": "底注",
"playAgainCount": "再来一次次数",
"progressDraws": "已完成 {over} 次",
"progressFailed": "失败前 {over} 次",
"platformProfit": "平台赚取金额", "platformProfit": "平台赚取金额",
"totalDrawCount": "总抽奖次数", "totalDrawCount": "总抽奖次数",
"createdBy": "创建管理员", "createdBy": "创建管理员",
"remark": "备注",
"createTime": "创建时间", "createTime": "创建时间",
"statusFail": "失败", "statusFail": "失败",
"statusDone": "完成", "statusDone": "完成",
@@ -36,6 +48,10 @@
"recordId": "记录ID", "recordId": "记录ID",
"testCount": "测试次数", "testCount": "测试次数",
"testCountSuffix": "次", "testCountSuffix": "次",
"testCountProgress": "进行中:已完成 {over} 次",
"testCountFailed": "失败前 {over} 次",
"chainModeLabel": "链式再来一次",
"paidPlannedSpins": "计划付费次数",
"createTime": "创建时间", "createTime": "创建时间",
"admin": "执行管理员", "admin": "执行管理员",
"paidPoolId": "付费奖池配置ID", "paidPoolId": "付费奖池配置ID",

View File

@@ -47,5 +47,11 @@
"ruleRoleRequired": "请选择角色", "ruleRoleRequired": "请选择角色",
"addSuccess": "新增成功", "addSuccess": "新增成功",
"editSuccess": "修改成功" "editSuccess": "修改成功"
},
"ui": {
"promptNewPassword": "请输入新密码",
"passwordLengthError": "密码长度在6到16之间",
"passwordChanged": "修改密码成功",
"clearCacheConfirm": "确定要清理缓存吗?"
} }
} }

View File

@@ -16,5 +16,16 @@
"tplCategory": "生成类型", "tplCategory": "生成类型",
"updateTime": "更新时间", "updateTime": "更新时间",
"createTime": "创建时间" "createTime": "创建时间"
},
"ui": {
"generating": "代码生成下载中,请稍后",
"generateSuccess": "代码生成成功,开始下载",
"downloadFail": "文件下载失败",
"syncConfirm": "执行同步操作将会覆盖已经设置的表结构,确定要同步吗?",
"syncSuccess": "同步成功",
"generateToProjectConfirm": "生成到项目将会覆盖原有文件,确定要生成吗?",
"generateToProjectSuccess": "生成到项目成功",
"loadSuccess": "装载成功",
"copyToClipboard": "代码已复制到剪贴板"
} }
} }

View File

@@ -58,5 +58,11 @@
"ruleTargetRequired": "调用目标不能为空", "ruleTargetRequired": "调用目标不能为空",
"addSuccess": "新增成功", "addSuccess": "新增成功",
"editSuccess": "修改成功" "editSuccess": "修改成功"
},
"ui": {
"runTitle": "运行任务",
"runConfirm": "确定要运行任务【{name}】吗?",
"runSuccess": "任务运行成功",
"selectTaskFirst": "请先选择一个任务"
} }
} }

View File

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

View File

@@ -22,7 +22,6 @@
{{ formatCoin(scope.row.coin) }} {{ formatCoin(scope.row.coin) }}
</template> </template>
</ElTableColumn> </ElTableColumn>
<ElTableColumn :label="$t('console.newPlayer.ticket')" prop="total_ticket_count" min-width="100" align="center" />
</template> </template>
</ArtTable> </ArtTable>
</div> </div>

View File

@@ -0,0 +1,149 @@
<template>
<div class="art-full-height">
<TableSearch v-model="searchForm" @search="handleSearch" @reset="resetSearchParams" />
<ElCard class="art-table-card" shadow="never">
<ArtTableHeader v-model:columns="columnChecks" :loading="loading" @refresh="refreshData">
<template #left>
<ElSpace wrap>
<ElButton
v-permission="'dice:ante_config:index:save'"
@click="showDialog('add')"
v-ripple
>
<template #icon>
<ArtSvgIcon icon="ri:add-fill" />
</template>
{{ $t('table.actions.add') }}
</ElButton>
<ElButton
v-permission="'dice:ante_config:index:destroy'"
:disabled="selectedRows.length === 0"
@click="deleteSelectedRows(api.delete, refreshData)"
v-ripple
>
<template #icon>
<ArtSvgIcon icon="ri:delete-bin-5-line" />
</template>
{{ $t('table.actions.delete') }}
</ElButton>
</ElSpace>
</template>
</ArtTableHeader>
<ArtTable
ref="tableRef"
rowKey="id"
:loading="loading"
:data="data"
:columns="columns"
:pagination="pagination"
@sort-change="handleSortChange"
@selection-change="handleSelectionChange"
@pagination:size-change="handleSizeChange"
@pagination:current-change="handleCurrentChange"
>
<template #is_default="{ row }">
<ElTag :type="row.is_default === 1 ? 'primary' : 'warning'" size="small">
{{ row.is_default === 1 ? $t('page.table.defaultYes') : $t('page.table.defaultNo') }}
</ElTag>
</template>
<template #operation="{ row }">
<div class="flex gap-2">
<SaButton
v-permission="'dice:ante_config:index:update'"
type="secondary"
@click="showDialog('edit', row)"
/>
<SaButton
v-permission="'dice:ante_config:index:destroy'"
type="error"
@click="deleteRow(row, api.delete, refreshData)"
/>
</div>
</template>
</ArtTable>
</ElCard>
<EditDialog
v-model="dialogVisible"
:dialog-type="dialogType"
:data="dialogData"
@success="refreshData"
/>
</div>
</template>
<script setup lang="ts">
import { useTable } from '@/hooks/core/useTable'
import { useSaiAdmin } from '@/composables/useSaiAdmin'
import api from '../../api/ante_config/index'
import TableSearch from './modules/table-search.vue'
import EditDialog from './modules/edit-dialog.vue'
const searchForm = ref({
name: undefined,
title: undefined,
is_default: undefined
})
const handleSearch = (params: Record<string, unknown>) => {
Object.assign(searchParams, params)
getData()
}
const {
columns,
columnChecks,
data,
loading,
getData,
searchParams,
pagination,
resetSearchParams,
handleSortChange,
handleSizeChange,
handleCurrentChange,
refreshData
} = useTable({
core: {
apiFn: api.list,
columnsFactory: () => [
{ type: 'selection' },
{ prop: 'id', label: 'page.table.id', width: 80, align: 'center' },
{ prop: 'name', label: 'page.table.name', align: 'center' },
{ prop: 'title', label: 'page.table.title', align: 'center' },
{ prop: 'mult', label: 'page.table.mult', align: 'center' },
{
prop: 'is_default',
label: 'page.table.isDefault',
width: 110,
align: 'center',
useSlot: true
},
{ prop: 'create_time', label: 'page.table.createTime', width: 170, align: 'center' },
{ prop: 'update_time', label: 'page.table.updateTime', width: 170, align: 'center' },
{
prop: 'operation',
label: 'table.actions.operation',
width: 100,
align: 'center',
fixed: 'right',
useSlot: true
}
]
}
})
const {
dialogType,
dialogVisible,
dialogData,
showDialog,
deleteRow,
deleteSelectedRows,
handleSelectionChange,
selectedRows
} = useSaiAdmin()
</script>

View File

@@ -0,0 +1,126 @@
<template>
<el-dialog
v-model="visible"
:title="dialogType === 'add' ? $t('page.form.titleAdd') : $t('page.form.titleEdit')"
width="560px"
align-center
:close-on-click-modal="false"
@close="handleClose"
>
<el-form ref="formRef" :model="formData" :rules="rules" label-width="120px">
<el-form-item :label="$t('page.form.labelName')" prop="name">
<el-input v-model="formData.name" :placeholder="$t('page.form.placeholderName')" />
</el-form-item>
<el-form-item :label="$t('page.form.labelTitle')" prop="title">
<el-input v-model="formData.title" :placeholder="$t('page.form.placeholderTitle')" />
</el-form-item>
<el-form-item :label="$t('page.form.labelMult')" prop="mult">
<el-input-number v-model="formData.mult" :min="1" :step="1" style="width: 100%" />
</el-form-item>
<el-form-item :label="$t('page.form.labelIsDefault')" prop="is_default">
<el-radio-group v-model="formData.is_default">
<el-radio :value="1">{{ $t('page.table.defaultYes') }}</el-radio>
<el-radio :value="0">{{ $t('page.table.defaultNo') }}</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="handleClose">{{ $t('common.cancel') }}</el-button>
<el-button type="primary" @click="handleSubmit">{{ $t('table.form.submit') }}</el-button>
</template>
</el-dialog>
</template>
<script setup lang="ts">
import api from '../../../api/ante_config/index'
import { ElMessage } from 'element-plus'
import type { FormInstance, FormRules } from 'element-plus'
import { useI18n } from 'vue-i18n'
const { t } = useI18n()
interface Props {
modelValue: boolean
dialogType: string
data?: Record<string, unknown>
}
interface Emits {
(e: 'update:modelValue', value: boolean): void
(e: 'success'): void
}
const props = withDefaults(defineProps<Props>(), {
modelValue: false,
dialogType: 'add',
data: undefined
})
const emit = defineEmits<Emits>()
const formRef = ref<FormInstance>()
const visible = computed({
get: () => props.modelValue,
set: (value) => emit('update:modelValue', value)
})
const rules = computed<FormRules>(() => ({
name: [{ required: true, message: t('page.form.ruleNameRequired'), trigger: 'blur' }],
title: [{ required: true, message: t('page.form.ruleTitleRequired'), trigger: 'blur' }],
mult: [{ required: true, message: t('page.form.ruleMultRequired'), trigger: 'blur' }],
is_default: [{ required: true, message: t('page.form.ruleDefaultRequired'), trigger: 'change' }]
}))
interface AnteFormData {
id: number | null
name: string
title: string
mult: number
is_default: number
}
const initialFormData: AnteFormData = {
id: null,
name: '',
title: '',
mult: 1,
is_default: 0
}
const formData = reactive({ ...initialFormData })
watch(
() => props.modelValue,
async (newVal) => {
if (!newVal) return
Object.assign(formData, initialFormData)
if (!props.data) return
await nextTick()
if (typeof props.data.id === 'number') formData.id = props.data.id
if (typeof props.data.name === 'string') formData.name = props.data.name
if (typeof props.data.title === 'string') formData.title = props.data.title
formData.mult = Number(props.data.mult ?? 1) || 1
formData.is_default = Number(props.data.is_default ?? 0) === 1 ? 1 : 0
}
)
function handleClose() {
visible.value = false
formRef.value?.resetFields()
}
async function handleSubmit() {
if (!formRef.value) return
try {
await formRef.value.validate()
if (props.dialogType === 'add') {
await api.save(formData)
ElMessage.success(t('page.form.addSuccess'))
} else {
await api.update(formData)
ElMessage.success(t('page.form.editSuccess'))
}
emit('success')
handleClose()
} catch (error) {
console.log(error)
}
}
</script>

View File

@@ -0,0 +1,76 @@
<template>
<sa-search-bar
ref="searchBarRef"
v-model="formData"
label-width="100px"
:showExpand="false"
@reset="handleReset"
@search="handleSearch"
>
<el-col v-bind="setSpan(6)">
<el-form-item :label="$t('page.search.name')" prop="name">
<el-input v-model="formData.name" :placeholder="$t('page.search.placeholderName')" clearable />
</el-form-item>
</el-col>
<el-col v-bind="setSpan(6)">
<el-form-item :label="$t('page.search.title')" prop="title">
<el-input v-model="formData.title" :placeholder="$t('page.search.placeholderTitle')" clearable />
</el-form-item>
</el-col>
<el-col v-bind="setSpan(6)">
<el-form-item :label="$t('page.search.isDefault')" prop="is_default">
<el-select v-model="formData.is_default" :placeholder="$t('page.search.placeholderIsDefault')" clearable>
<el-option :label="$t('page.table.defaultYes')" :value="1" />
<el-option :label="$t('page.table.defaultNo')" :value="0" />
</el-select>
</el-form-item>
</el-col>
</sa-search-bar>
</template>
<script setup lang="ts">
type AnteConfigSearchForm = {
name?: string
title?: string
/** 1=是 0=否 */
is_default?: 0 | 1 | null
[key: string]: unknown
}
interface Props {
modelValue: AnteConfigSearchForm
}
interface Emits {
(e: 'update:modelValue', value: AnteConfigSearchForm): void
(e: 'search', params: AnteConfigSearchForm): void
(e: 'reset'): void
}
const props = defineProps<Props>()
const emit = defineEmits<Emits>()
const searchBarRef = ref()
const formData = computed<AnteConfigSearchForm>({
get: () => props.modelValue,
set: (val) => emit('update:modelValue', val)
})
function handleReset() {
searchBarRef.value?.ref.resetFields()
emit('reset')
}
function handleSearch() {
emit('search', formData.value)
}
const setSpan = (span: number) => {
return {
span,
xs: 24,
sm: span >= 12 ? span : 12,
md: span >= 8 ? span : 8,
lg: span,
xl: span
}
}
</script>

View File

@@ -0,0 +1,40 @@
import request from '@/utils/http'
/**
* 底注配置 API
*/
export default {
list(params: Record<string, unknown>) {
return request.get<Api.Common.ApiPage>({
url: '/core/dice/ante_config/DiceAnteConfig/index',
params
})
},
read(id: number | string) {
return request.get<Api.Common.ApiData>({
url: '/core/dice/ante_config/DiceAnteConfig/read?id=' + id
})
},
save(params: Record<string, unknown>) {
return request.post({
url: '/core/dice/ante_config/DiceAnteConfig/save',
data: params
})
},
update(params: Record<string, unknown>) {
return request.put({
url: '/core/dice/ante_config/DiceAnteConfig/update',
data: params
})
},
delete(params: Record<string, unknown>) {
return request.del({
url: '/core/dice/ante_config/DiceAnteConfig/destroy',
data: params
})
}
}

View File

@@ -11,7 +11,7 @@ export default {
*/ */
list(params: Record<string, any>) { list(params: Record<string, any>) {
return request.get<Api.Common.ApiPage>({ return request.get<Api.Common.ApiPage>({
url: '/dice/config/DiceConfig/index', url: '/core/dice/config/DiceConfig/index',
params params
}) })
}, },
@@ -23,7 +23,7 @@ export default {
*/ */
read(id: number | string) { read(id: number | string) {
return request.get<Api.Common.ApiData>({ return request.get<Api.Common.ApiData>({
url: '/dice/config/DiceConfig/read?id=' + id url: '/core/dice/config/DiceConfig/read?id=' + id
}) })
}, },
@@ -34,7 +34,7 @@ export default {
*/ */
save(params: Record<string, any>) { save(params: Record<string, any>) {
return request.post<any>({ return request.post<any>({
url: '/dice/config/DiceConfig/save', url: '/core/dice/config/DiceConfig/save',
data: params data: params
}) })
}, },
@@ -46,7 +46,7 @@ export default {
*/ */
update(params: Record<string, any>) { update(params: Record<string, any>) {
return request.put<any>({ return request.put<any>({
url: '/dice/config/DiceConfig/update', url: '/core/dice/config/DiceConfig/update',
data: params data: params
}) })
}, },
@@ -58,7 +58,7 @@ export default {
*/ */
delete(params: Record<string, any>) { delete(params: Record<string, any>) {
return request.del<any>({ return request.del<any>({
url: '/dice/config/DiceConfig/destroy', url: '/core/dice/config/DiceConfig/destroy',
data: params data: params
}) })
} }

View File

@@ -11,7 +11,7 @@ export default {
*/ */
list(params: Record<string, any>) { list(params: Record<string, any>) {
return request.get<Api.Common.ApiPage>({ return request.get<Api.Common.ApiPage>({
url: '/dice/play_record/DicePlayRecord/index', url: '/core/dice/play_record/DicePlayRecord/index',
params params
}) })
}, },
@@ -23,7 +23,7 @@ export default {
*/ */
read(id: number | string) { read(id: number | string) {
return request.get<Api.Common.ApiData>({ return request.get<Api.Common.ApiData>({
url: '/dice/play_record/DicePlayRecord/read?id=' + id url: '/core/dice/play_record/DicePlayRecord/read?id=' + id
}) })
}, },
@@ -34,7 +34,7 @@ export default {
*/ */
save(params: Record<string, any>) { save(params: Record<string, any>) {
return request.post<any>({ return request.post<any>({
url: '/dice/play_record/DicePlayRecord/save', url: '/core/dice/play_record/DicePlayRecord/save',
data: params data: params
}) })
}, },
@@ -46,7 +46,7 @@ export default {
*/ */
update(params: Record<string, any>) { update(params: Record<string, any>) {
return request.put<any>({ return request.put<any>({
url: '/dice/play_record/DicePlayRecord/update', url: '/core/dice/play_record/DicePlayRecord/update',
data: params data: params
}) })
}, },
@@ -58,7 +58,7 @@ export default {
*/ */
delete(params: Record<string, any>) { delete(params: Record<string, any>) {
return request.del<any>({ return request.del<any>({
url: '/dice/play_record/DicePlayRecord/destroy', url: '/core/dice/play_record/DicePlayRecord/destroy',
data: params data: params
}) })
}, },
@@ -66,21 +66,14 @@ export default {
/** 获取玩家选项id、username */ /** 获取玩家选项id、username */
getPlayerOptions() { getPlayerOptions() {
return request.get<{ id: number; username: string }[]>({ return request.get<{ id: number; username: string }[]>({
url: '/dice/play_record/DicePlayRecord/getPlayerOptions' url: '/core/dice/play_record/DicePlayRecord/getPlayerOptions'
}) })
}, },
/** 获取彩金池配置选项id、name */ /** 获取彩金池配置选项id、name */
getLotteryConfigOptions() { getLotteryConfigOptions() {
return request.get<{ id: number; name: string }[]>({ return request.get<{ id: number; name: string }[]>({
url: '/dice/play_record/DicePlayRecord/getLotteryConfigOptions' url: '/core/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'
}) })
} }
} }

View File

@@ -10,7 +10,7 @@ export default {
* @returns 数据列表 * @returns 数据列表
*/ */
list(params: Record<string, any>) { list(params: Record<string, any>) {
return request.get<Api.Common.ApiPage>({ return request.get<Api.Common.ApiPage & { total_win_coin?: number }>({
url: '/core/dice/play_record_test/DicePlayRecordTest/index', url: '/core/dice/play_record_test/DicePlayRecordTest/index',
params params
}) })

View File

@@ -11,7 +11,7 @@ export default {
*/ */
list(params: Record<string, any>) { list(params: Record<string, any>) {
return request.get<Api.Common.ApiPage>({ return request.get<Api.Common.ApiPage>({
url: '/dice/player/DicePlayer/index', url: '/core/dice/player/DicePlayer/index',
params params
}) })
}, },
@@ -23,7 +23,7 @@ export default {
*/ */
read(id: number | string) { read(id: number | string) {
return request.get<Api.Common.ApiData>({ return request.get<Api.Common.ApiData>({
url: '/dice/player/DicePlayer/read?id=' + id url: '/core/dice/player/DicePlayer/read?id=' + id
}) })
}, },
@@ -34,7 +34,7 @@ export default {
*/ */
save(params: Record<string, any>) { save(params: Record<string, any>) {
return request.post<any>({ return request.post<any>({
url: '/dice/player/DicePlayer/save', url: '/core/dice/player/DicePlayer/save',
data: params data: params
}) })
}, },
@@ -46,7 +46,7 @@ export default {
*/ */
update(params: Record<string, any>) { update(params: Record<string, any>) {
return request.put<any>({ return request.put<any>({
url: '/dice/player/DicePlayer/update', url: '/core/dice/player/DicePlayer/update',
data: params data: params
}) })
}, },
@@ -58,7 +58,7 @@ export default {
*/ */
delete(params: Record<string, any>) { delete(params: Record<string, any>) {
return request.del<any>({ return request.del<any>({
url: '/dice/player/DicePlayer/destroy', url: '/core/dice/player/DicePlayer/destroy',
data: params data: params
}) })
}, },
@@ -68,7 +68,7 @@ export default {
*/ */
updateStatus(params: { id: number | string; status: number }) { updateStatus(params: { id: number | string; status: number }) {
return request.put<any>({ return request.put<any>({
url: '/dice/player/DicePlayer/updateStatus', url: '/core/dice/player/DicePlayer/updateStatus',
data: params data: params
}) })
}, },
@@ -79,7 +79,7 @@ export default {
*/ */
async getLotteryConfigOptions(): Promise<Array<{ id: number; name: string }>> { async getLotteryConfigOptions(): Promise<Array<{ id: number; name: string }>> {
const res = await request.get<any>({ const res = await request.get<any>({
url: '/dice/player/DicePlayer/getLotteryConfigOptions' url: '/core/dice/player/DicePlayer/getLotteryConfigOptions'
}) })
const rows = (Array.isArray(res) ? res : (res?.data ?? [])) as Array<{ id: number; name: string }> const rows = (Array.isArray(res) ? res : (res?.data ?? [])) as Array<{ id: number; name: string }>
return rows.map((r) => ({ id: Number(r.id), name: String(r.name ?? r.id ?? '') })) return rows.map((r) => ({ id: Number(r.id), name: String(r.name ?? r.id ?? '') }))
@@ -93,7 +93,7 @@ export default {
Array<{ id: number; username: string; realname: string; label: string }> Array<{ id: number; username: string; realname: string; label: string }>
> { > {
const res = await request.get<any>({ const res = await request.get<any>({
url: '/dice/player/DicePlayer/getSystemUserOptions' url: '/core/dice/player/DicePlayer/getSystemUserOptions'
}) })
const rows = (Array.isArray(res) ? res : (res?.data ?? [])) as Array<{ const rows = (Array.isArray(res) ? res : (res?.data ?? [])) as Array<{
id: number id: number

View File

@@ -11,7 +11,7 @@ export default {
*/ */
list(params: Record<string, any>) { list(params: Record<string, any>) {
return request.get<Api.Common.ApiPage>({ return request.get<Api.Common.ApiPage>({
url: '/dice/player_ticket_record/DicePlayerTicketRecord/index', url: '/core/dice/player_ticket_record/DicePlayerTicketRecord/index',
params params
}) })
}, },
@@ -23,7 +23,7 @@ export default {
*/ */
read(id: number | string) { read(id: number | string) {
return request.get<Api.Common.ApiData>({ return request.get<Api.Common.ApiData>({
url: '/dice/player_ticket_record/DicePlayerTicketRecord/read?id=' + id url: '/core/dice/player_ticket_record/DicePlayerTicketRecord/read?id=' + id
}) })
}, },
@@ -34,7 +34,7 @@ export default {
*/ */
save(params: Record<string, any>) { save(params: Record<string, any>) {
return request.post<any>({ return request.post<any>({
url: '/dice/player_ticket_record/DicePlayerTicketRecord/save', url: '/core/dice/player_ticket_record/DicePlayerTicketRecord/save',
data: params data: params
}) })
}, },
@@ -46,7 +46,7 @@ export default {
*/ */
update(params: Record<string, any>) { update(params: Record<string, any>) {
return request.put<any>({ return request.put<any>({
url: '/dice/player_ticket_record/DicePlayerTicketRecord/update', url: '/core/dice/player_ticket_record/DicePlayerTicketRecord/update',
data: params data: params
}) })
}, },
@@ -58,7 +58,7 @@ export default {
*/ */
delete(params: Record<string, any>) { delete(params: Record<string, any>) {
return request.del<any>({ return request.del<any>({
url: '/dice/player_ticket_record/DicePlayerTicketRecord/destroy', url: '/core/dice/player_ticket_record/DicePlayerTicketRecord/destroy',
data: params data: params
}) })
}, },
@@ -68,7 +68,7 @@ export default {
*/ */
getPlayerOptions() { getPlayerOptions() {
return request.get<Api.Common.ApiData>({ return request.get<Api.Common.ApiData>({
url: '/dice/player_ticket_record/DicePlayerTicketRecord/getPlayerOptions' url: '/core/dice/player_ticket_record/DicePlayerTicketRecord/getPlayerOptions'
}) })
} }
} }

View File

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

View File

@@ -11,7 +11,7 @@ export default {
*/ */
list(params: Record<string, any>) { list(params: Record<string, any>) {
return request.get<Api.Common.ApiPage>({ return request.get<Api.Common.ApiPage>({
url: '/dice/reward_config_record/DiceRewardConfigRecord/index', url: '/core/dice/reward_config_record/DiceRewardConfigRecord/index',
params params
}) })
}, },
@@ -23,7 +23,7 @@ export default {
*/ */
read(id: number | string) { read(id: number | string) {
return request.get<Api.Common.ApiData>({ return request.get<Api.Common.ApiData>({
url: '/dice/reward_config_record/DiceRewardConfigRecord/read?id=' + id url: '/core/dice/reward_config_record/DiceRewardConfigRecord/read?id=' + id
}) })
}, },
@@ -34,7 +34,7 @@ export default {
*/ */
save(params: Record<string, any>) { save(params: Record<string, any>) {
return request.post<any>({ return request.post<any>({
url: '/dice/reward_config_record/DiceRewardConfigRecord/save', url: '/core/dice/reward_config_record/DiceRewardConfigRecord/save',
data: params data: params
}) })
}, },
@@ -46,7 +46,7 @@ export default {
*/ */
update(params: Record<string, any>) { update(params: Record<string, any>) {
return request.put<any>({ return request.put<any>({
url: '/dice/reward_config_record/DiceRewardConfigRecord/update', url: '/core/dice/reward_config_record/DiceRewardConfigRecord/update',
data: params data: params
}) })
}, },
@@ -58,7 +58,7 @@ export default {
*/ */
delete(params: Record<string, any>) { delete(params: Record<string, any>) {
return request.del<any>({ return request.del<any>({
url: '/dice/reward_config_record/DiceRewardConfigRecord/destroy', url: '/core/dice/reward_config_record/DiceRewardConfigRecord/destroy',
data: params data: params
}) })
}, },
@@ -77,7 +77,7 @@ export default {
lottery_config_id?: number | null lottery_config_id?: number | null
}) { }) {
return request.post<any>({ return request.post<any>({
url: '/dice/reward_config_record/DiceRewardConfigRecord/importFromRecord', url: '/core/dice/reward_config_record/DiceRewardConfigRecord/importFromRecord',
data: params data: params
}) })
} }

View File

@@ -56,21 +56,52 @@
<!-- 抽奖类型 tag --> <!-- 抽奖类型 tag -->
<template #lottery_type="{ row }"> <template #lottery_type="{ row }">
<ElTag size="small" :type="row.lottery_type === 0 ? 'warning' : 'success'"> <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> </ElTag>
</template> </template>
<!-- 是否中大奖 tag --> <!-- 是否中大奖 tag -->
<template #is_win="{ row }"> <template #is_win="{ row }">
<ElTag size="small" :type="row.is_win === 1 ? 'success' : 'info'"> <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> </ElTag>
</template> </template>
<!-- 方向 tag --> <!-- 方向 tag -->
<template #direction="{ row }"> <template #direction="{ row }">
<ElTag size="small" :type="row.direction === 0 ? 'primary' : 'warning'"> <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> </ElTag>
</template> </template>
<!-- 平台币相关统一整数显示 -->
<template #win_coin="{ row }">
<span>{{ formatPlatformCoin(row?.win_coin) }}</span>
</template>
<template #super_win_coin="{ row }">
<span>{{ formatPlatformCoin(row?.super_win_coin) }}</span>
</template>
<template #reward_win_coin="{ row }">
<span>{{ formatPlatformCoin(row?.reward_win_coin) }}</span>
</template>
<template #paid_amount="{ row }">
<span>{{ formatPlatformCoin(row?.paid_amount) }}</span>
</template>
<!-- 摇取点数 tag --> <!-- 摇取点数 tag -->
<template #roll_array="{ row }"> <template #roll_array="{ row }">
<ElTag size="small"> <ElTag size="small">
@@ -129,7 +160,7 @@
direction: undefined direction: undefined
}) })
/** 当前筛选下平台总盈利(付费抽奖次数×100 - 玩家总收益) */ /** 当前筛选下平台总盈利(付费金额 paid_amount 求和 - 玩家总收益) */
const totalWinCoin = ref<number | null>(null) const totalWinCoin = ref<number | null>(null)
const listApi = async (params: Record<string, any>) => { const listApi = async (params: Record<string, any>) => {
@@ -148,8 +179,7 @@
row?.dicePlayer?.username ?? row?.player_id ?? '-' row?.dicePlayer?.username ?? row?.player_id ?? '-'
const lotteryConfigNameFormatter = (row: Record<string, any>) => const lotteryConfigNameFormatter = (row: Record<string, any>) =>
row?.diceLotteryPoolConfig?.name ?? row?.lottery_config_id ?? '-' 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 */ /** 摇取点数格式化为 1,3,4,5,6,6 */
function formatRollArray(val: unknown): string { function formatRollArray(val: unknown): string {
@@ -166,6 +196,13 @@
return String(val) return String(val)
} }
function formatPlatformCoin(val: unknown): string {
if (val === '' || val === null || val === undefined) return '-'
const n = typeof val === 'number' ? val : Number(val)
if (!Number.isFinite(n)) return '-'
return n.toFixed(2)
}
// 表格配置 // 表格配置
const { const {
columns, columns,
@@ -199,23 +236,32 @@
useSlot: true useSlot: true
}, },
{ prop: 'lottery_type', label: 'page.table.drawType', width: 100, useSlot: true }, { prop: 'lottery_type', label: 'page.table.drawType', width: 100, useSlot: true },
{ prop: 'is_win', label: 'page.table.isBigWin', width: 100, useSlot: true },
{ prop: 'win_coin', label: 'page.table.winCoin', width: 110 },
{ prop: 'super_win_coin', label: 'page.table.superWinCoin', width: 120 },
{ prop: 'reward_win_coin', label: 'page.table.rewardWinCoin', width: 140 },
{ prop: 'direction', label: 'page.table.direction', width: 90, 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', useSlot: true },
{ 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: 'start_index', label: 'page.table.startIndex', width: 90 }, { prop: 'start_index', label: 'page.table.startIndex', width: 90 },
{ prop: 'target_index', label: 'page.table.targetIndex', width: 90 }, { prop: 'target_index', label: 'page.table.targetIndex', width: 90 },
{ prop: 'roll_array', label: 'page.table.rollArray', width: 140, useSlot: true }, { prop: 'roll_array', label: 'page.table.rollArray', width: 140, useSlot: true },
{ prop: 'roll_number', label: 'page.table.rollNumber', width: 110, sortable: 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) formatter: (row: Record<string, any>) => rewardTierFormatter(row)
}, },
{ prop: 'create_time', label: 'page.table.createTime', width: 170 }, { prop: 'create_time', label: 'page.table.createTime', width: 170 },
{ prop: 'update_time', label: 'page.table.updateTime', 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
}
] ]
} }
}) })

View File

@@ -70,7 +70,7 @@
<el-input-number <el-input-number
v-model="formData.win_coin" v-model="formData.win_coin"
:placeholder="$t('page.form.placeholderWinCoin')" :placeholder="$t('page.form.placeholderWinCoin')"
:precision="2" :precision="0"
style="width: 100%" style="width: 100%"
:disabled="dialogType === 'edit'" :disabled="dialogType === 'edit'"
/> />
@@ -79,7 +79,7 @@
<el-input-number <el-input-number
v-model="formData.super_win_coin" v-model="formData.super_win_coin"
:placeholder="$t('page.form.placeholderSuperWinCoin')" :placeholder="$t('page.form.placeholderSuperWinCoin')"
:precision="2" :precision="0"
:min="0" :min="0"
style="width: 100%" style="width: 100%"
:disabled="dialogType === 'edit'" :disabled="dialogType === 'edit'"
@@ -89,7 +89,7 @@
<el-input-number <el-input-number
v-model="formData.reward_win_coin" v-model="formData.reward_win_coin"
:placeholder="$t('page.form.placeholderRewardWinCoin')" :placeholder="$t('page.form.placeholderRewardWinCoin')"
:precision="2" :precision="0"
:min="0" :min="0"
style="width: 100%" style="width: 100%"
:disabled="dialogType === 'edit'" :disabled="dialogType === 'edit'"
@@ -153,25 +153,21 @@
:disabled="dialogType === 'edit'" :disabled="dialogType === 'edit'"
/> />
</el-form-item> </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 <el-select
v-model="formData.reward_config_id" v-model="formData.reward_tier"
:placeholder="$t('page.form.placeholderRewardConfig')" :placeholder="$t('page.form.placeholderRewardTier')"
clearable clearable
filterable filterable
style="width: 100%" 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-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
@@ -239,12 +235,11 @@
trigger: 'change' 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 playerOptions = ref<Array<{ id: number; username: string }>>([])
const lotteryConfigOptions = ref<Array<{ id: number; name: string }>>([]) const lotteryConfigOptions = ref<Array<{ id: number; name: string }>>([])
const rewardConfigOptions = ref<Array<{ id: number; ui_text: string; tier: string }>>([])
const initialFormData = { const initialFormData = {
id: null as number | null, id: null as number | null,
@@ -260,7 +255,7 @@
target_index: null as number | null, target_index: null as number | null,
roll_array: null as string | number[] | null, roll_array: null as string | number[] | null,
roll_number: null as number | null, roll_number: null as number | null,
reward_config_id: null as number | null reward_tier: '' as string
} }
/** 摇取点数固定 5 位 [n0..n4],每项 16 */ /** 摇取点数固定 5 位 [n0..n4],每项 16 */
@@ -277,22 +272,17 @@
if (open) { if (open) {
initPage() initPage()
try { try {
const [players, lotteryConfigs, rewardConfigs] = await Promise.all([ const [players, lotteryConfigs] = await Promise.all([
api.getPlayerOptions(), api.getPlayerOptions(),
api.getLotteryConfigOptions(), api.getLotteryConfigOptions()
api.getRewardConfigOptions()
]) ])
playerOptions.value = Array.isArray(players) ? players : ((players as any)?.data ?? []) playerOptions.value = Array.isArray(players) ? players : ((players as any)?.data ?? [])
lotteryConfigOptions.value = Array.isArray(lotteryConfigs) lotteryConfigOptions.value = Array.isArray(lotteryConfigs)
? lotteryConfigs ? lotteryConfigs
: ((lotteryConfigs as any)?.data ?? []) : ((lotteryConfigs as any)?.data ?? [])
rewardConfigOptions.value = Array.isArray(rewardConfigs)
? rewardConfigs
: ((rewardConfigs as any)?.data ?? [])
} catch { } catch {
playerOptions.value = [] playerOptions.value = []
lotteryConfigOptions.value = [] lotteryConfigOptions.value = []
rewardConfigOptions.value = []
} }
} }
} }
@@ -322,7 +312,7 @@
'target_index', 'target_index',
'roll_array', 'roll_array',
'roll_number', 'roll_number',
'reward_config_id' 'reward_tier'
] ]
keys.forEach((key) => { keys.forEach((key) => {
const val = props.data![key] const val = props.data![key]

View File

@@ -48,7 +48,7 @@
<el-input-number <el-input-number
v-model="formData.win_coin_min" v-model="formData.win_coin_min"
:placeholder="$t('table.searchBar.min')" :placeholder="$t('table.searchBar.min')"
:precision="2" :precision="0"
controls-position="right" controls-position="right"
class="range-input" class="range-input"
/> />
@@ -56,7 +56,7 @@
<el-input-number <el-input-number
v-model="formData.win_coin_max" v-model="formData.win_coin_max"
:placeholder="$t('table.searchBar.max')" :placeholder="$t('table.searchBar.max')"
:precision="2" :precision="0"
controls-position="right" controls-position="right"
class="range-input" class="range-input"
/> />
@@ -101,6 +101,7 @@
<el-option label="T3" value="T3" /> <el-option label="T3" value="T3" />
<el-option label="T4" value="T4" /> <el-option label="T4" value="T4" />
<el-option label="T5" value="T5" /> <el-option label="T5" value="T5" />
<el-option label="BIGWIN" value="BIGWIN" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>

View File

@@ -8,7 +8,9 @@
<ArtTableHeader v-model:columns="columnChecks" :loading="loading" @refresh="refreshData"> <ArtTableHeader v-model:columns="columnChecks" :loading="loading" @refresh="refreshData">
<template #left> <template #left>
<span v-if="totalWinCoin !== null" class="table-summary-inline"> <span v-if="totalWinCoin !== null" class="table-summary-inline">
{{ $t('page.toolbar.platformTotalProfit') }}<strong>{{ totalWinCoin }}</strong> {{ $t('page.toolbar.platformTotalProfit') }}<strong>{{
formatPlatformCoin(totalWinCoin)
}}</strong>
</span> </span>
<ElSpace wrap class="table-toolbar-buttons"> <ElSpace wrap class="table-toolbar-buttons">
<ElButton <ElButton
@@ -58,19 +60,37 @@
<!-- 抽奖类型 --> <!-- 抽奖类型 -->
<template #lottery_type="{ row }"> <template #lottery_type="{ row }">
<ElTag size="small" :type="row.lottery_type === 0 ? 'warning' : 'success'"> <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> </ElTag>
</template> </template>
<!-- 是否中大奖 --> <!-- 是否中大奖 -->
<template #is_win="{ row }"> <template #is_win="{ row }">
<ElTag size="small" :type="row.is_win === 1 ? 'success' : 'info'"> <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> </ElTag>
</template> </template>
<!-- 方向 --> <!-- 方向 -->
<template #direction="{ row }"> <template #direction="{ row }">
<ElTag size="small" :type="row.direction === 0 ? 'primary' : 'warning'"> <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> </ElTag>
</template> </template>
<!-- 摇取点数 --> <!-- 摇取点数 -->
@@ -79,10 +99,20 @@
{{ formatRollArray(row.roll_array) }} {{ formatRollArray(row.roll_array) }}
</ElTag> </ElTag>
</template> </template>
<!-- 奖励档位显示 DiceRewardConfig.tier --> <!-- 奖励档位优先显示记录自带 reward_tier -->
<template #reward_config_id="{ row }"> <template #reward_tier="{ row }">
<ElTag size="small">{{ rewardTierFormatter(row) }}</ElTag> <ElTag size="small">{{ rewardTierFormatter(row) }}</ElTag>
</template> </template>
<!-- 平台币相关统一整数显示 -->
<template #win_coin="{ row }">
<span>{{ formatPlatformCoin(row?.win_coin) }}</span>
</template>
<template #super_win_coin="{ row }">
<span>{{ formatPlatformCoin(row?.super_win_coin) }}</span>
</template>
<template #reward_win_coin="{ row }">
<span>{{ formatPlatformCoin(row?.reward_win_coin) }}</span>
</template>
<!-- 状态 --> <!-- 状态 -->
<template #status="{ row }"> <template #status="{ row }">
<ElTag size="small" :type="row.status === 1 ? 'success' : 'info'"> <ElTag size="small" :type="row.status === 1 ? 'success' : 'info'">
@@ -129,28 +159,30 @@
// 搜索表单(与 play_record 对齐:方向、赢取平台币范围、是否中大奖、中奖档位、点数和) // 搜索表单(与 play_record 对齐:方向、赢取平台币范围、是否中大奖、中奖档位、点数和)
const searchForm = ref<Record<string, unknown>>({ const searchForm = ref<Record<string, unknown>>({
reward_config_record_id: undefined,
lottery_type: undefined, lottery_type: undefined,
direction: undefined, direction: undefined,
is_win: undefined, is_win: undefined,
paid_amount: undefined,
ante: undefined,
win_coin_min: undefined, win_coin_min: undefined,
win_coin_max: undefined, win_coin_max: undefined,
reward_tier: undefined, reward_tier: undefined,
roll_number: undefined roll_number: undefined
}) })
// 当前筛选下平台总盈利(付费抽奖次数×100 - 玩家总收益) // 当前筛选下平台总盈利(付费金额 paid_amount 求和 - 玩家总收益)
const totalWinCoin = ref<number | null>(null) const totalWinCoin = ref<number | null>(null)
const listApi = async (params: Record<string, any>) => { const listApi = async (params: Record<string, any>) => {
const res = await api.list(params) const res = await api.list(params)
totalWinCoin.value = (res as any)?.total_win_coin ?? null totalWinCoin.value = res?.total_win_coin ?? null
return res return res
} }
const lotteryConfigNameFormatter = (row: Record<string, any>) => const lotteryConfigNameFormatter = (row: Record<string, any>) =>
row?.diceLotteryPoolConfig?.name ?? row?.lottery_config_id ?? '-' 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 */ /** 摇取点数格式化为 1,3,4,5,6 */
function formatRollArray(val: unknown): string { function formatRollArray(val: unknown): string {
@@ -167,17 +199,24 @@
return String(val) return String(val)
} }
function formatPlatformCoin(val: unknown): string {
if (val === '' || val === null || val === undefined) return '-'
const n = typeof val === 'number' ? val : Number(val)
if (!Number.isFinite(n)) return '-'
return n.toFixed(2)
}
const handleClearAll = async () => { const handleClearAll = async () => {
try { try {
await ElMessageBox.confirm('确定清空所有玩家抽奖测试数据?', '提示', { await ElMessageBox.confirm(t('page.ui.clearAllConfirm'), t('uiMsg.titlePrompt'), {
type: 'warning' type: 'warning'
}) })
await api.clearAll() await api.clearAll()
ElMessage.success('已清空所有测试数据') ElMessage.success(t('page.ui.clearAllSuccess'))
getData() getData()
} catch (e: any) { } catch (e: any) {
if (e !== 'cancel') { if (e !== 'cancel') {
ElMessage.error(e?.message || '清空失败') ElMessage.error(e?.message || t('page.ui.clearAllFail'))
} }
} }
} }
@@ -208,21 +247,39 @@
columnsFactory: () => [ columnsFactory: () => [
{ type: 'selection' }, { type: 'selection' },
{ prop: 'id', label: 'page.table.id', width: 80 }, { prop: 'id', label: 'page.table.id', width: 80 },
{ prop: 'lottery_config_id', label: 'page.table.lotteryPoolConfig', width: 120, useSlot: true }, {
prop: 'reward_config_record_id',
label: 'page.table.rewardConfigRecordId',
width: 120
},
{
prop: 'lottery_config_id',
label: 'page.table.lotteryPoolConfig',
width: 120,
useSlot: true
},
{ prop: 'lottery_type', label: 'page.table.drawType', width: 100, useSlot: true }, { prop: 'lottery_type', label: 'page.table.drawType', width: 100, useSlot: true },
{ prop: 'is_win', label: 'page.table.isBigWin', width: 100, useSlot: true },
{ prop: 'win_coin', label: 'page.table.winCoin', width: 110 },
{ prop: 'super_win_coin', label: 'page.table.superWinCoin', width: 120 },
{ prop: 'reward_win_coin', label: 'page.table.rewardWinCoin', width: 140 },
{ prop: 'direction', label: 'page.table.direction', width: 90, 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: '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: 'start_index', label: 'page.table.startIndex', width: 90 }, { prop: 'start_index', label: 'page.table.startIndex', width: 90 },
{ prop: 'target_index', label: 'page.table.targetIndex', width: 90 }, { prop: 'target_index', label: 'page.table.targetIndex', width: 90 },
{ prop: 'roll_array', label: 'page.table.rollArray', width: 140, useSlot: true }, { prop: 'roll_array', label: 'page.table.rollArray', width: 140, useSlot: true },
{ prop: 'roll_number', label: 'page.table.rollNumber', width: 110, sortable: 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: 'status', label: 'page.table.status', width: 80, useSlot: true },
{ prop: 'create_time', label: 'page.table.createTime', width: 170 }, { prop: 'create_time', label: 'page.table.createTime', 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
}
] ]
} }
}) })

View File

@@ -28,6 +28,24 @@
<el-option :label="$t('page.search.anticlockwise')" :value="1" /> <el-option :label="$t('page.search.anticlockwise')" :value="1" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('page.search.ante')" prop="ante">
<el-input-number
v-model="formData.ante"
:placeholder="$t('table.searchBar.all')"
:precision="0"
controls-position="right"
style="width: 100%"
/>
</el-form-item>
<el-form-item :label="$t('page.search.paidAmount')" prop="paid_amount">
<el-input-number
v-model="formData.paid_amount"
:placeholder="$t('table.searchBar.all')"
:precision="0"
controls-position="right"
style="width: 100%"
/>
</el-form-item>
<el-form-item :label="$t('page.search.isBigWin')" prop="is_win"> <el-form-item :label="$t('page.search.isBigWin')" prop="is_win">
<el-select v-model="formData.is_win" :placeholder="$t('form.placeholderSelect')" clearable style="width: 100%"> <el-select v-model="formData.is_win" :placeholder="$t('form.placeholderSelect')" clearable style="width: 100%">
<el-option :label="$t('page.search.noBigWin')" :value="0" /> <el-option :label="$t('page.search.noBigWin')" :value="0" />
@@ -38,7 +56,7 @@
<el-input-number <el-input-number
v-model="formData.win_coin" v-model="formData.win_coin"
:placeholder="$t('page.form.placeholderWinCoin')" :placeholder="$t('page.form.placeholderWinCoin')"
:precision="2" :precision="0"
controls-position="right" controls-position="right"
style="width: 100%" style="width: 100%"
/> />
@@ -49,21 +67,15 @@
:placeholder="$t('page.form.placeholderRewardTier')" :placeholder="$t('page.form.placeholderRewardTier')"
clearable clearable
style="width: 100%" style="width: 100%"
@change="onRewardTierChange"
> >
<el-option label="T1" value="T1" /> <el-option label="T1" value="T1" />
<el-option label="T2" value="T2" /> <el-option label="T2" value="T2" />
<el-option label="T3" value="T3" /> <el-option label="T3" value="T3" />
<el-option label="T4" value="T4" /> <el-option label="T4" value="T4" />
<el-option label="T5" value="T5" /> <el-option label="T5" value="T5" />
<el-option label="BIGWIN" value="BIGWIN" />
</el-select> </el-select>
</el-form-item> </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-form-item :label="$t('page.table.startIndex')" prop="start_index">
<el-input v-model="formData.start_index" :placeholder="$t('page.form.placeholderStartIndex')" /> <el-input v-model="formData.start_index" :placeholder="$t('page.form.placeholderStartIndex')" />
</el-form-item> </el-form-item>
@@ -80,10 +92,22 @@
<sa-radio v-model="formData.status" dict="data_status" /> <sa-radio v-model="formData.status" dict="data_status" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('page.table.superWinCoin')" prop="super_win_coin"> <el-form-item :label="$t('page.table.superWinCoin')" prop="super_win_coin">
<el-input v-model="formData.super_win_coin" :placeholder="$t('page.form.placeholderSuperWinCoin')" /> <el-input-number
v-model="formData.super_win_coin"
:placeholder="$t('page.form.placeholderSuperWinCoin')"
:precision="0"
controls-position="right"
style="width: 100%"
/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('page.table.rewardWinCoin')" prop="reward_win_coin"> <el-form-item :label="$t('page.table.rewardWinCoin')" prop="reward_win_coin">
<el-input v-model="formData.reward_win_coin" :placeholder="$t('page.form.placeholderRewardWinCoin')" /> <el-input-number
v-model="formData.reward_win_coin"
:placeholder="$t('page.form.placeholderRewardWinCoin')"
:precision="0"
controls-position="right"
style="width: 100%"
/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('page.form.labelAdminId')" prop="admin_id"> <el-form-item :label="$t('page.form.labelAdminId')" prop="admin_id">
<el-input v-model="formData.admin_id" :placeholder="$t('page.form.placeholderAdminId')" /> <el-input v-model="formData.admin_id" :placeholder="$t('page.form.placeholderAdminId')" />
@@ -98,7 +122,6 @@
<script setup lang="ts"> <script setup lang="ts">
import api from '../../../api/play_record_test/index' import api from '../../../api/play_record_test/index'
import rewardConfigApi from '../../../api/reward_config/index'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import type { FormInstance, FormRules } from 'element-plus' import type { FormInstance, FormRules } from 'element-plus'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
@@ -141,7 +164,7 @@
lottery_type: [{ required: true, message: t('page.form.ruleDrawTypeRequired'), trigger: 'blur' }], lottery_type: [{ required: true, message: t('page.form.ruleDrawTypeRequired'), trigger: 'blur' }],
is_win: [{ required: true, message: t('page.form.ruleIsBigWinRequired'), trigger: 'blur' }], is_win: [{ required: true, message: t('page.form.ruleIsBigWinRequired'), trigger: 'blur' }],
direction: [{ required: true, message: t('page.form.ruleDirectionRequired'), 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' }] status: [{ required: true, message: t('page.form.ruleStatusRequired'), trigger: 'blur' }]
})) }))
@@ -153,17 +176,18 @@
lottery_config_id: null, lottery_config_id: null,
lottery_type: null, lottery_type: null,
is_win: null, is_win: null,
ante: 1,
paid_amount: 0,
win_coin: 0, win_coin: 0,
direction: null, direction: null,
reward_tier: undefined as string | undefined, reward_tier: undefined as string | undefined,
reward_config_id: null,
start_index: null, start_index: null,
target_index: null, target_index: null,
roll_number: null, roll_number: null,
roll_array: '', roll_array: '',
status: 1, status: 1,
super_win_coin: '0.00', super_win_coin: 0,
reward_win_coin: '0.00', reward_win_coin: 0,
admin_id: null admin_id: null
} }
@@ -200,44 +224,26 @@
/** /**
* 初始化表单数据 * 初始化表单数据
*/ */
function normalizePlatformCoin(val: unknown): number {
if (val === '' || val === null || val === undefined) return 0
const n = typeof val === 'number' ? val : Number(val)
if (!Number.isFinite(n)) return 0
return Math.trunc(n)
}
const initForm = () => { const initForm = () => {
if (props.data) { if (props.data) {
for (const key in formData) { for (const key in formData) {
if (key === 'reward_tier') continue
if (props.data[key] != null && props.data[key] !== undefined) { if (props.data[key] != null && props.data[key] !== undefined) {
;(formData as Record<string, unknown>)[key] = props.data[key] ;(formData as Record<string, unknown>)[key] = props.data[key]
} }
} }
if (typeof formData.win_coin === 'string') { formData.win_coin = normalizePlatformCoin(formData.win_coin)
formData.win_coin = parseFloat(formData.win_coin) || 0 formData.super_win_coin = normalizePlatformCoin(formData.super_win_coin)
} formData.reward_win_coin = normalizePlatformCoin(formData.reward_win_coin)
} }
} }
/**
* 中奖档位变更:按档位拉取奖励配置并取第一条的 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 as any)?.data ?? (Array.isArray(res) ? res : [])
const first = Array.isArray(list) ? list[0] : (list?.data?.[0] ?? list?.[0])
if (first && first.id != null) {
formData.reward_config_id = first.id
} else {
formData.reward_config_id = null
}
} catch {
formData.reward_config_id = null
}
}
/** /**
* 关闭弹窗并重置表单 * 关闭弹窗并重置表单
@@ -255,7 +261,6 @@
try { try {
await formRef.value.validate() await formRef.value.validate()
const payload = { ...formData } const payload = { ...formData }
delete (payload as Record<string, unknown>).reward_tier
if (props.dialogType === 'add') { if (props.dialogType === 'add') {
await api.save(payload) await api.save(payload)
ElMessage.success(t('page.form.addSuccess')) ElMessage.success(t('page.form.addSuccess'))

View File

@@ -8,6 +8,18 @@
@search="handleSearch" @search="handleSearch"
@expand="handleExpand" @expand="handleExpand"
> >
<el-col v-bind="setSpan(6)">
<el-form-item :label="$t('page.search.rewardConfigRecordId')" prop="reward_config_record_id">
<el-input-number
v-model="formData.reward_config_record_id"
:placeholder="$t('table.searchBar.all')"
:precision="0"
:step="1"
controls-position="right"
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col v-bind="setSpan(6)"> <el-col v-bind="setSpan(6)">
<el-form-item :label="$t('page.search.drawType')" prop="lottery_type"> <el-form-item :label="$t('page.search.drawType')" prop="lottery_type">
<el-select v-model="formData.lottery_type" :placeholder="$t('table.searchBar.all')" clearable style="width: 100%"> <el-select v-model="formData.lottery_type" :placeholder="$t('table.searchBar.all')" clearable style="width: 100%">
@@ -32,13 +44,35 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-bind="setSpan(6)">
<el-form-item :label="$t('page.search.paidAmount')" prop="paid_amount">
<el-input-number
v-model="formData.paid_amount"
:placeholder="$t('table.searchBar.all')"
:precision="0"
controls-position="right"
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col v-bind="setSpan(6)">
<el-form-item :label="$t('page.search.ante')" prop="ante">
<el-input-number
v-model="formData.ante"
:placeholder="$t('table.searchBar.all')"
:precision="0"
controls-position="right"
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col v-bind="setSpan(6)"> <el-col v-bind="setSpan(6)">
<el-form-item :label="$t('page.search.winCoin')" prop="win_coin_min"> <el-form-item :label="$t('page.search.winCoin')" prop="win_coin_min">
<div class="range-wrap"> <div class="range-wrap">
<el-input-number <el-input-number
v-model="formData.win_coin_min" v-model="formData.win_coin_min"
:placeholder="$t('table.searchBar.min')" :placeholder="$t('table.searchBar.min')"
:precision="2" :precision="0"
controls-position="right" controls-position="right"
class="range-input" class="range-input"
/> />
@@ -46,7 +80,7 @@
<el-input-number <el-input-number
v-model="formData.win_coin_max" v-model="formData.win_coin_max"
:placeholder="$t('table.searchBar.max')" :placeholder="$t('table.searchBar.max')"
:precision="2" :precision="0"
controls-position="right" controls-position="right"
class="range-input" class="range-input"
/> />
@@ -61,6 +95,7 @@
<el-option label="T3" value="T3" /> <el-option label="T3" value="T3" />
<el-option label="T4" value="T4" /> <el-option label="T4" value="T4" />
<el-option label="T5" value="T5" /> <el-option label="T5" value="T5" />
<el-option label="BIGWIN" value="BIGWIN" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>

View File

@@ -98,6 +98,7 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { useI18n } from 'vue-i18n'
import { useTable } from '@/hooks/core/useTable' import { useTable } from '@/hooks/core/useTable'
import { useSaiAdmin } from '@/composables/useSaiAdmin' import { useSaiAdmin } from '@/composables/useSaiAdmin'
import api from '../../api/player/index' import api from '../../api/player/index'
@@ -105,6 +106,8 @@
import EditDialog from './modules/edit-dialog.vue' import EditDialog from './modules/edit-dialog.vue'
import WalletOperateDialog from './modules/WalletOperateDialog.vue' import WalletOperateDialog from './modules/WalletOperateDialog.vue'
const { t } = useI18n()
// 搜索表单 // 搜索表单
const searchForm = ref({ const searchForm = ref({
username: undefined, username: undefined,
@@ -129,7 +132,8 @@
// 根据 lottery_config_id 显示彩金池配置名称 // 根据 lottery_config_id 显示彩金池配置名称
const lotteryConfigNameFormatter = (row: any) => 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 { const {
@@ -163,7 +167,7 @@
{ {
prop: 'coin', prop: 'coin',
label: 'page.table.coin', label: 'page.table.coin',
width: 100, width: 110,
align: 'center', align: 'center',
useSlot: true useSlot: true
}, },

View File

@@ -82,6 +82,7 @@
username: undefined, username: undefined,
use_coins_min: undefined, use_coins_min: undefined,
use_coins_max: undefined, use_coins_max: undefined,
ante: undefined,
total_ticket_count_min: undefined, total_ticket_count_min: undefined,
total_ticket_count_max: undefined, total_ticket_count_max: undefined,
paid_ticket_count_min: undefined, paid_ticket_count_min: undefined,
@@ -136,6 +137,7 @@
formatter: (row: Record<string, any>) => usernameFormatter(row) formatter: (row: Record<string, any>) => usernameFormatter(row)
}, },
{ prop: 'use_coins', label: 'page.table.useCoins', align: 'center' }, { prop: 'use_coins', label: 'page.table.useCoins', align: 'center' },
{ prop: 'ante', label: 'page.table.ante', align: 'center' },
{ prop: 'total_ticket_count', label: 'page.table.totalDrawCount', align: 'center' }, { prop: 'total_ticket_count', label: 'page.table.totalDrawCount', align: 'center' },
{ prop: 'paid_ticket_count', label: 'page.table.paidDrawCount', align: 'center' }, { prop: 'paid_ticket_count', label: 'page.table.paidDrawCount', align: 'center' },
{ prop: 'free_ticket_count', label: 'page.table.freeDrawCount', align: 'center' }, { prop: 'free_ticket_count', label: 'page.table.freeDrawCount', align: 'center' },

View File

@@ -34,6 +34,18 @@
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col v-bind="setSpan(6)">
<el-form-item :label="$t('page.search.ante')" prop="ante">
<el-input-number
v-model="formData.ante"
:placeholder="$t('table.searchBar.all')"
:min="1"
:precision="0"
controls-position="right"
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col v-bind="setSpan(6)"> <el-col v-bind="setSpan(6)">
<el-form-item :label="$t('page.search.totalDrawCount')" prop="total_ticket_count_min"> <el-form-item :label="$t('page.search.totalDrawCount')" prop="total_ticket_count_min">
<div class="range-wrap"> <div class="range-wrap">

View File

@@ -146,6 +146,13 @@
return player?.username ?? row.player_id ?? '-' return player?.username ?? row.player_id ?? '-'
} }
function formatMoney2(val: unknown): string {
if (val === '' || val === null || val === undefined) return '-'
const n = typeof val === 'number' ? val : Number(val)
if (!Number.isFinite(n)) return '-'
return n.toFixed(2)
}
// 表格配置 // 表格配置
const { const {
columns, columns,
@@ -190,8 +197,20 @@
align: 'center', align: 'center',
formatter: operatorFormatter formatter: operatorFormatter
}, },
{ prop: 'wallet_before', label: 'page.table.walletBefore', width: 110, align: 'center' }, {
{ prop: 'wallet_after', label: 'page.table.walletAfter', width: 110, align: 'center' }, prop: 'wallet_before',
label: 'page.table.walletBefore',
width: 110,
align: 'center',
formatter: (row: Record<string, any>) => formatMoney2(row?.wallet_before)
},
{
prop: 'wallet_after',
label: 'page.table.walletAfter',
width: 110,
align: 'center',
formatter: (row: Record<string, any>) => formatMoney2(row?.wallet_after)
},
{ {
prop: 'remark', prop: 'remark',
label: 'page.table.remark', label: 'page.table.remark',

View File

@@ -46,6 +46,7 @@
v-model="formData.coin" v-model="formData.coin"
:placeholder="$t('page.form.placeholderCoinChange')" :placeholder="$t('page.form.placeholderCoinChange')"
:precision="2" :precision="2"
:step="1"
style="width: 100%" style="width: 100%"
@change="onCoinChange" @change="onCoinChange"
:disabled="dialogType === 'edit'" :disabled="dialogType === 'edit'"
@@ -131,14 +132,22 @@
type: [{ required: true, message: '请选择类型', trigger: 'change' }] type: [{ required: true, message: '请选择类型', trigger: 'change' }]
}) })
const initialFormData = { const initialFormData: {
id: null as number | null, id: number | null
player_id: null as number | null, player_id: number | null
coin: 0 as number, coin: number
type: null as number | null, type: number | null
wallet_before: 0 as number, wallet_before: number
wallet_after: 0 as number, wallet_after: number
remark: '' as string remark: string
} = {
id: null,
player_id: null,
coin: 0,
type: null,
wallet_before: 0,
wallet_after: 0,
remark: ''
} }
const formData = reactive({ ...initialFormData }) const formData = reactive({ ...initialFormData })
@@ -170,7 +179,7 @@
function calcWalletAfter() { function calcWalletAfter() {
const before = Number(formData.wallet_before) || 0 const before = Number(formData.wallet_before) || 0
const coin = Number(formData.coin) || 0 const coin = Number(formData.coin) || 0
formData.wallet_after = Math.round((before + coin) * 100) / 100 formData.wallet_after = Number((before + coin).toFixed(2))
} }
watch( watch(
@@ -196,23 +205,24 @@
} }
} }
const numKeys = ['id', 'player_id', 'coin', 'type', 'wallet_before', 'wallet_after'] function normalizeMoney2(val: unknown, fallback: number): number {
if (val === '' || val === null || val === undefined) return fallback
const n = typeof val === 'number' ? val : Number(val)
if (!Number.isFinite(n)) return fallback
return Number(n.toFixed(2))
}
const initForm = () => { const initForm = () => {
if (!props.data) return if (!props.data) return
for (const key of Object.keys(formData)) {
if (!(key in props.data)) continue formData.id = props.data.id != null && props.data.id !== '' ? Number(props.data.id) : null
const val = props.data[key] formData.player_id =
if (numKeys.includes(key)) { props.data.player_id != null && props.data.player_id !== '' ? Number(props.data.player_id) : null
if (key === 'id' || key === 'player_id' || key === 'type') { formData.type = props.data.type != null && props.data.type !== '' ? Number(props.data.type) : null
;(formData as any)[key] = val != null && val !== '' ? Number(val) : null formData.coin = normalizeMoney2(props.data.coin, 0)
} else { formData.wallet_before = normalizeMoney2(props.data.wallet_before, 0)
;(formData as any)[key] = val != null && val !== '' ? Number(val) : 0 formData.wallet_after = normalizeMoney2(props.data.wallet_after, 0)
} formData.remark = props.data.remark ?? ''
} else {
;(formData as any)[key] = val ?? ''
}
}
} }
const handleClose = () => { const handleClose = () => {

View File

@@ -70,6 +70,13 @@
return api.list({ ...params, direction: currentDirection.value }) return api.list({ ...params, direction: currentDirection.value })
} }
function formatMoney2(val: unknown): string {
if (val === '' || val === null || val === undefined) return '-'
const n = typeof val === 'number' ? val : Number(val)
if (!Number.isFinite(n)) return '-'
return n.toFixed(2)
}
const handleSearch = (params: Record<string, any>) => { const handleSearch = (params: Record<string, any>) => {
Object.assign(searchParams, { ...params, direction: currentDirection.value }) Object.assign(searchParams, { ...params, direction: currentDirection.value })
getData() getData()
@@ -117,7 +124,13 @@
align: 'center', align: 'center',
showOverflowTooltip: true showOverflowTooltip: true
}, },
{ prop: 'real_ev', label: 'page.table.realEv', width: 110, align: 'center' }, {
prop: 'real_ev',
label: 'page.table.realEv',
width: 110,
align: 'center',
formatter: (row: Record<string, any>) => formatMoney2(row?.real_ev)
},
{ prop: 'remark', label: 'page.table.remark', minWidth: 80, align: 'center', showOverflowTooltip: true }, { prop: 'remark', label: 'page.table.remark', minWidth: 80, align: 'center', showOverflowTooltip: true },
{ prop: 'weight', label: 'page.table.weight', width: 110, align: 'center' } { prop: 'weight', label: 'page.table.weight', width: 110, align: 'center' }
] ]

View File

@@ -60,7 +60,11 @@
width="90" width="90"
align="center" align="center"
show-overflow-tooltip show-overflow-tooltip
/> >
<template #default="{ row }">
<span>{{ formatMoney2(row?.real_ev) }}</span>
</template>
</el-table-column>
<el-table-column <el-table-column
:label="$t('page.weightShared.colUiText')" :label="$t('page.weightShared.colUiText')"
prop="ui_text" prop="ui_text"
@@ -250,6 +254,13 @@
import api from '../../../api/reward/index' import api from '../../../api/reward/index'
import ArtBarChart from '@/components/core/charts/art-bar-chart/index.vue' import ArtBarChart from '@/components/core/charts/art-bar-chart/index.vue'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
function formatMoney2(val: unknown): string {
if (val === '' || val === null || val === undefined) return '-'
const n = typeof val === 'number' ? val : Number(val)
if (!Number.isFinite(n)) return '-'
return n.toFixed(2)
}
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
const { t } = useI18n() const { t } = useI18n()

View File

@@ -54,7 +54,11 @@
width="90" width="90"
align="center" align="center"
show-overflow-tooltip show-overflow-tooltip
/> >
<template #default="{ row }">
<span>{{ formatMoney2(row?.real_ev) }}</span>
</template>
</el-table-column>
<el-table-column <el-table-column
:label="$t('page.weightShared.colUiText')" :label="$t('page.weightShared.colUiText')"
prop="ui_text" prop="ui_text"
@@ -315,6 +319,13 @@
import ArtBarChart from '@/components/core/charts/art-bar-chart/index.vue' import ArtBarChart from '@/components/core/charts/art-bar-chart/index.vue'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
function formatMoney2(val: unknown): string {
if (val === '' || val === null || val === undefined) return '-'
const n = typeof val === 'number' ? val : Number(val)
if (!Number.isFinite(n)) return '-'
return n.toFixed(2)
}
const { t, locale } = useI18n() const { t, locale } = useI18n()

View File

@@ -11,152 +11,140 @@
<template #title>{{ $t('page.weightTest.alertTitle') }}</template> <template #title>{{ $t('page.weightTest.alertTitle') }}</template>
{{ $t('page.weightTest.alertBody') }} {{ $t('page.weightTest.alertBody') }}
</ElAlert> </ElAlert>
<ElForm ref="formRef" :model="form" label-width="140px"> <ElAlert type="warning" :closable="false" show-icon class="weight-test-tip chain-tip">
<ElSteps :active="currentStep" finish-status="success" simple class="steps-wrap"> {{ $t('page.weightTest.chainModeHint') }}
<ElStep :title="$t('page.weightTest.stepPaid')" /> </ElAlert>
<ElStep :title="$t('page.weightTest.stepFree')" /> <ElAlert type="info" :closable="false" show-icon class="weight-test-tip chain-tip">
</ElSteps> {{ $t('page.weightTest.killModeHint') }}
</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>
<ElFormItem :label="$t('page.weightTest.labelKillModeEnabled')" prop="kill_mode_enabled">
<ElSwitch v-model="form.kill_mode_enabled" />
</ElFormItem>
<ElFormItem :label="$t('page.weightTest.labelTestSafetyLine')" prop="test_safety_line">
<ElInputNumber
v-model="form.test_safety_line"
:min="0"
:step="100"
:disabled="!form.kill_mode_enabled"
style="width: 100%"
/>
</ElFormItem>
<!-- 第一页付费抽奖券 --> <div class="section-title">{{ $t('page.weightTest.sectionPaid') }}</div>
<div v-show="currentStep === 0" class="step-panel"> <ElFormItem
<ElFormItem :label="$t('page.weightTest.labelLotteryTypePaid')"
:label="$t('page.weightTest.labelLotteryTypePaid')" prop="paid_lottery_config_id"
prop="paid_lottery_config_id" >
<ElSelect
v-model="form.paid_lottery_config_id"
:placeholder="$t('page.weightTest.placeholderPaidPool')"
clearable
filterable
style="width: 100%"
> >
<ElSelect <ElOption
v-model="form.paid_lottery_config_id" v-for="item in paidLotteryOptions"
:placeholder="$t('page.weightTest.placeholderPaidPool')" :key="item.id"
clearable :label="item.name"
filterable :value="item.id"
style="width: 100%" />
> </ElSelect>
<ElOption </ElFormItem>
v-for="item in paidLotteryOptions" <template v-if="form.paid_lottery_config_id == null">
:key="item.id" <div class="tier-label">{{ $t('page.weightTest.tierProbHint') }}</div>
:label="item.name" <ElRow :gutter="12" class="tier-row">
:value="item.id" <ElCol v-for="t in tierKeys" :key="'paid-' + t" :span="8">
/> <div class="tier-field">
</ElSelect> <label class="tier-field-label">{{
</ElFormItem> $t('page.weightTest.tierFieldLabel', { tier: t })
<template v-if="form.paid_lottery_config_id == null"> }}</label>
<div class="tier-label">{{ $t('page.weightTest.tierProbHint') }}</div> <input
<ElRow :gutter="12" class="tier-row"> type="number"
<ElCol v-for="t in tierKeys" :key="'paid-' + t" :span="8"> :value="getPaidTier(t)"
<div class="tier-field"> min="0"
<label class="tier-field-label">{{ max="100"
$t('page.weightTest.tierFieldLabel', { tier: t }) placeholder="0"
}}</label> class="tier-input"
<input @input="setPaidTier(t, $event)"
type="number" />
:value="getPaidTier(t)" </div>
min="0" </ElCol>
max="100" </ElRow>
placeholder="0" <div v-if="paidTierSum > 100" class="tier-error">{{
class="tier-input" $t('page.weightTest.tierSumError', { sum: paidTierSum })
@input="setPaidTier(t, $event)" }}</div>
/> </template>
</div> <ElFormItem :label="$t('page.weightTest.labelCwCount')" prop="paid_s_count" required>
</ElCol> <ElSelect
</ElRow> v-model="form.paid_s_count"
<div v-if="paidTierSum > 100" class="tier-error">{{ :placeholder="$t('page.weightTest.placeholderSelect')"
$t('page.weightTest.tierSumError', { sum: paidTierSum }) style="width: 100%"
}}</div> >
</template> <ElOption v-for="c in countOptions" :key="c" :label="String(c)" :value="c" />
<ElFormItem :label="$t('page.weightTest.labelCwCount')" prop="paid_s_count" required> </ElSelect>
<ElSelect </ElFormItem>
v-model="form.paid_s_count" <ElFormItem :label="$t('page.weightTest.labelCcwCount')" prop="paid_n_count" required>
:placeholder="$t('page.weightTest.placeholderSelect')" <ElSelect
style="width: 100%" v-model="form.paid_n_count"
> :placeholder="$t('page.weightTest.placeholderSelect')"
<ElOption v-for="c in countOptions" :key="c" :label="String(c)" :value="c" /> style="width: 100%"
</ElSelect> >
</ElFormItem> <ElOption v-for="c in countOptions" :key="c" :label="String(c)" :value="c" />
<ElFormItem :label="$t('page.weightTest.labelCcwCount')" prop="paid_n_count" required> </ElSelect>
<ElSelect </ElFormItem>
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>
<!-- 第二页免费抽奖券 --> <div class="section-title">{{ $t('page.weightTest.sectionFreeAfterPlayAgain') }}</div>
<div v-show="currentStep === 1" class="step-panel"> <ElFormItem
<ElFormItem :label="$t('page.weightTest.labelLotteryTypeFree')"
:label="$t('page.weightTest.labelLotteryTypeFree')" prop="free_lottery_config_id"
prop="free_lottery_config_id" >
<ElSelect
v-model="form.free_lottery_config_id"
:placeholder="$t('page.weightTest.placeholderFreePool')"
clearable
filterable
style="width: 100%"
> >
<ElSelect <ElOption
v-model="form.free_lottery_config_id" v-for="item in freeLotteryOptions"
:placeholder="$t('page.weightTest.placeholderFreePool')" :key="item.id"
clearable :label="item.name"
filterable :value="item.id"
style="width: 100%" />
> </ElSelect>
<ElOption </ElFormItem>
v-for="item in freeLotteryOptions" <template v-if="form.free_lottery_config_id == null">
:key="item.id" <div class="tier-label">{{ $t('page.weightTest.tierProbHintFreeChain') }}</div>
:label="item.name" <ElRow :gutter="12" class="tier-row">
:value="item.id" <ElCol v-for="t in tierKeys" :key="'free-' + t" :span="8">
/> <div class="tier-field">
</ElSelect> <label class="tier-field-label">{{
</ElFormItem> $t('page.weightTest.tierFieldLabel', { tier: t })
<template v-if="form.free_lottery_config_id == null"> }}</label>
<div class="tier-label">{{ $t('page.weightTest.tierProbHint') }}</div> <input
<ElRow :gutter="12" class="tier-row"> type="number"
<ElCol v-for="t in tierKeys" :key="'free-' + t" :span="8"> :value="getFreeTier(t)"
<div class="tier-field"> min="0"
<label class="tier-field-label">{{ max="100"
$t('page.weightTest.tierFieldLabel', { tier: t }) placeholder="0"
}}</label> class="tier-input"
<input @input="setFreeTier(t, $event)"
type="number" />
:value="getFreeTier(t)" </div>
min="0" </ElCol>
max="100" </ElRow>
placeholder="0" <div v-if="freeTierSum > 100" class="tier-error">{{
class="tier-input" $t('page.weightTest.tierSumError', { sum: freeTierSum })
@input="setFreeTier(t, $event)" }}</div>
/> </template>
</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>
</ElForm> </ElForm>
<template #footer> <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 <ElButton
v-if="currentStep === 1"
v-permission="'dice:reward:index:startWeightTest'" v-permission="'dice:reward:index:startWeightTest'"
type="primary" type="primary"
:loading="running" :loading="running"
@@ -184,17 +172,16 @@
const visible = defineModel<boolean>({ default: false }) const visible = defineModel<boolean>({ default: false })
const emit = defineEmits<{ (e: 'success'): void }>() const emit = defineEmits<{ (e: 'success'): void }>()
const formRef = ref()
const currentStep = ref(0)
const form = reactive({ const form = reactive({
ante: 1,
paid_lottery_config_id: undefined as number | undefined, paid_lottery_config_id: undefined as number | undefined,
free_lottery_config_id: undefined as number | undefined, free_lottery_config_id: undefined as number | undefined,
paid_tier_weights: { T1: 20, T2: 20, T3: 20, T4: 20, T5: 20 } as Record<string, number>, 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>, free_tier_weights: { T1: 20, T2: 20, T3: 20, T4: 20, T5: 20 } as Record<string, number>,
paid_s_count: 100, paid_s_count: 100,
paid_n_count: 100, paid_n_count: 100,
free_s_count: 100, kill_mode_enabled: false,
free_n_count: 100 test_safety_line: 5000
}) })
const lotteryOptions = ref<Array<{ id: number; name: string }>>([]) const lotteryOptions = ref<Array<{ id: number; name: string }>>([])
/** 付费抽奖券可选档位name=default */ /** 付费抽奖券可选档位name=default */
@@ -210,7 +197,6 @@
function onClose() { function onClose() {
running.value = false running.value = false
currentStep.value = 0
} }
function getPaidTier(t: string): string { function getPaidTier(t: string): string {
@@ -251,12 +237,10 @@
id: r.id, id: r.id,
name: r.name name: r.name
})) }))
// 付费抽奖券默认使用 name=default
const normal = list.find((r: { name?: string }) => r.name === 'default') const normal = list.find((r: { name?: string }) => r.name === 'default')
if (normal) { if (normal) {
form.paid_lottery_config_id = normal.id form.paid_lottery_config_id = normal.id
} }
// 免费抽奖券默认使用 name=killScore若无则默认选第一项
const kill = list.find((r: { name?: string }) => r.name === 'killScore') const kill = list.find((r: { name?: string }) => r.name === 'killScore')
if (kill) { if (kill) {
form.free_lottery_config_id = kill.id form.free_lottery_config_id = kill.id
@@ -270,10 +254,14 @@
function buildPayload() { function buildPayload() {
const payload: Record<string, unknown> = { const payload: Record<string, unknown> = {
ante: form.ante,
paid_s_count: form.paid_s_count, paid_s_count: form.paid_s_count,
paid_n_count: form.paid_n_count, paid_n_count: form.paid_n_count,
free_s_count: form.free_s_count, free_s_count: 0,
free_n_count: form.free_n_count free_n_count: 0,
chain_free_mode: true,
kill_mode_enabled: form.kill_mode_enabled,
test_safety_line: form.test_safety_line
} }
if (form.paid_lottery_config_id != null) { if (form.paid_lottery_config_id != null) {
payload.paid_lottery_config_id = form.paid_lottery_config_id payload.paid_lottery_config_id = form.paid_lottery_config_id
@@ -289,8 +277,16 @@
} }
function validateForm(): boolean { function validateForm(): boolean {
if (form.paid_s_count + form.paid_n_count + form.free_s_count + form.free_n_count <= 0) { if (form.ante == null || form.ante <= 0) {
ElMessage.warning(t('page.weightTest.warnTotalSpins')) ElMessage.warning(t('page.weightTest.warnAnte'))
return false
}
if (form.paid_s_count + form.paid_n_count <= 0) {
ElMessage.warning(t('page.weightTest.warnPaidSpins'))
return false
}
if (form.kill_mode_enabled && (form.test_safety_line == null || form.test_safety_line < 0)) {
ElMessage.warning(t('page.weightTest.warnTestSafetyLine'))
return false return false
} }
const needPaidTier = form.paid_lottery_config_id == null const needPaidTier = form.paid_lottery_config_id == null
@@ -342,28 +338,22 @@
onClose() 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> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.weight-test-tip { .weight-test-tip {
margin-bottom: 16px; margin-bottom: 16px;
} }
.steps-wrap { .chain-tip {
margin-bottom: 16px; margin-top: -8px;
} }
.step-panel { .section-title {
min-height: 200px; 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 { .tier-label {
font-size: 13px; font-size: 13px;

View File

@@ -21,6 +21,16 @@
<ElTabPane :label="$t('page.configPage.tabIndex')" name="index"> <ElTabPane :label="$t('page.configPage.tabIndex')" name="index">
<div class="tab-panel"> <div class="tab-panel">
<div class="panel-tip">{{ $t('page.configPage.tipIndex') }}</div> <div class="panel-tip">{{ $t('page.configPage.tipIndex') }}</div>
<div class="index-toolbar">
<ElButton
v-permission="'dice:reward_config:index:batchUpdate'"
type="default"
@click="openRuleGenerateDialog"
v-ripple
>
{{ $t('page.configPage.btnRuleGenerate') }}
</ElButton>
</div>
<div class="table-scroll-wrap"> <div class="table-scroll-wrap">
<ElTable <ElTable
v-loading="loading" v-loading="loading"
@@ -29,12 +39,21 @@
size="default" size="default"
class="config-table" class="config-table"
> >
<ElTableColumn :label="$t('page.configPage.colId')" prop="id" width="60" align="center"> <ElTableColumn
:label="$t('page.configPage.colId')"
prop="id"
width="60"
align="center"
>
<template #default="{ row }"> <template #default="{ row }">
<span>{{ row.id }}</span> <span>{{ row.id }}</span>
</template> </template>
</ElTableColumn> </ElTableColumn>
<ElTableColumn :label="$t('page.configPage.colDicePoints')" min-width="100" align="center"> <ElTableColumn
:label="$t('page.configPage.colDicePoints')"
min-width="100"
align="center"
>
<template #default="{ row }"> <template #default="{ row }">
<ElInputNumber <ElInputNumber
v-model="row.grid_number" v-model="row.grid_number"
@@ -46,7 +65,11 @@
/> />
</template> </template>
</ElTableColumn> </ElTableColumn>
<ElTableColumn :label="$t('page.configPage.colDisplayText')" min-width="100" align="center"> <ElTableColumn
:label="$t('page.configPage.colDisplayText')"
min-width="100"
align="center"
>
<template #default="{ row }"> <template #default="{ row }">
<ElInput <ElInput
v-model="row.ui_text" v-model="row.ui_text"
@@ -55,7 +78,11 @@
/> />
</template> </template>
</ElTableColumn> </ElTableColumn>
<ElTableColumn :label="$t('page.configPage.colDisplayTextEn')" min-width="120" align="center"> <ElTableColumn
:label="$t('page.configPage.colDisplayTextEn')"
min-width="120"
align="center"
>
<template #default="{ row }"> <template #default="{ row }">
<ElInput <ElInput
v-model="row.ui_text_en" v-model="row.ui_text_en"
@@ -64,16 +91,31 @@
/> />
</template> </template>
</ElTableColumn> </ElTableColumn>
<ElTableColumn :label="$t('page.configPage.colRealEv')" min-width="110" align="center"> <ElTableColumn
:label="$t('page.configPage.colRealEv')"
min-width="110"
align="center"
>
<template #default="{ row }"> <template #default="{ row }">
<ElInputNumber <ElInputNumber
v-model="row.real_ev" v-model="row.real_ev"
@change="handleRealEvChange(row)"
controls-position="right" controls-position="right"
size="small" size="small"
:step="1"
class="full-width" class="full-width"
/> />
</template> </template>
</ElTableColumn> </ElTableColumn>
<ElTableColumn
:label="$t('page.configPage.colRealReward')"
min-width="130"
align="center"
>
<template #default="{ row }">
<span>{{ formatMoney2(calcRealReward(row.real_ev)) }}</span>
</template>
</ElTableColumn>
<ElTableColumn :label="$t('page.configPage.colTier')" width="100" align="center"> <ElTableColumn :label="$t('page.configPage.colTier')" width="100" align="center">
<template #default="{ row }"> <template #default="{ row }">
<ElSelect <ElSelect
@@ -91,7 +133,11 @@
</ElSelect> </ElSelect>
</template> </template>
</ElTableColumn> </ElTableColumn>
<ElTableColumn :label="$t('page.configPage.colRemark')" min-width="140" align="center"> <ElTableColumn
:label="$t('page.configPage.colRemark')"
min-width="140"
align="center"
>
<template #default="{ row }"> <template #default="{ row }">
<ElInput <ElInput
v-model="row.remark" v-model="row.remark"
@@ -125,12 +171,20 @@
size="default" size="default"
class="config-table bigwin-table" class="config-table bigwin-table"
> >
<ElTableColumn :label="$t('page.configPage.colBigwinPoints')" width="100" align="center"> <ElTableColumn
:label="$t('page.configPage.colBigwinPoints')"
width="100"
align="center"
>
<template #default="{ row }"> <template #default="{ row }">
<span class="readonly-value">{{ row.grid_number }}</span> <span class="readonly-value">{{ row.grid_number }}</span>
</template> </template>
</ElTableColumn> </ElTableColumn>
<ElTableColumn :label="$t('page.configPage.colDisplayInfo')" min-width="140" align="center"> <ElTableColumn
:label="$t('page.configPage.colDisplayInfo')"
min-width="140"
align="center"
>
<template #default="{ row }"> <template #default="{ row }">
<ElInput <ElInput
v-model="row.ui_text" v-model="row.ui_text"
@@ -139,7 +193,11 @@
/> />
</template> </template>
</ElTableColumn> </ElTableColumn>
<ElTableColumn :label="$t('page.configPage.colDisplayInfoEn')" min-width="160" align="center"> <ElTableColumn
:label="$t('page.configPage.colDisplayInfoEn')"
min-width="160"
align="center"
>
<template #default="{ row }"> <template #default="{ row }">
<ElInput <ElInput
v-model="row.ui_text_en" v-model="row.ui_text_en"
@@ -148,17 +206,27 @@
/> />
</template> </template>
</ElTableColumn> </ElTableColumn>
<ElTableColumn :label="$t('page.configPage.colRealPrize')" min-width="120" align="center"> <ElTableColumn
:label="$t('page.configPage.colRealPrize')"
min-width="120"
align="center"
>
<template #default="{ row }"> <template #default="{ row }">
<ElInputNumber <ElInputNumber
v-model="row.real_ev" v-model="row.real_ev"
@change="handleRealEvChange(row)"
controls-position="right" controls-position="right"
size="small" size="small"
:step="1"
class="full-width" class="full-width"
/> />
</template> </template>
</ElTableColumn> </ElTableColumn>
<ElTableColumn :label="$t('page.configPage.colRemark')" min-width="140" align="center"> <ElTableColumn
:label="$t('page.configPage.colRemark')"
min-width="140"
align="center"
>
<template #default="{ row }"> <template #default="{ row }">
<ElInput <ElInput
v-model="row.remark" v-model="row.remark"
@@ -167,7 +235,11 @@
/> />
</template> </template>
</ElTableColumn> </ElTableColumn>
<ElTableColumn :label="$t('page.configPage.colWeightRange')" min-width="220" align="center"> <ElTableColumn
:label="$t('page.configPage.colWeightRange')"
min-width="220"
align="center"
>
<template #default="{ row }"> <template #default="{ row }">
<div class="weight-cell"> <div class="weight-cell">
<ElSlider <ElSlider
@@ -212,16 +284,194 @@
</ElTabPane> </ElTabPane>
</ElTabs> </ElTabs>
</ElCard> </ElCard>
<ElDialog
v-model="ruleGenerateDialogVisible"
:title="$t('page.configPage.ruleGenerateTitle')"
:width="ruleGenDialogWidth"
:fullscreen="ruleGenFullscreen"
align-center
destroy-on-close
:close-on-click-modal="false"
class="rule-generate-dialog"
>
<div class="rule-generate-rules">{{ $t('page.configPage.ruleGenerateRules') }}</div>
<ElForm
:label-position="ruleGenFormLabelPosition"
:label-width="ruleGenFormLabelWidth"
class="rule-generate-form"
@submit.prevent
>
<ElFormItem :label="$t('page.configPage.ruleGenT1Row')">
<div class="rule-gen-row">
<div class="rule-gen-cell">
<span class="rule-gen-hint">{{ $t('page.configPage.ruleGenFixedCount') }}</span>
<ElInputNumber
v-model="ruleGenT1Fixed"
class="rule-gen-input-num"
:min="0"
:max="26"
:step="1"
:controls="ruleGenInputControls"
:size="ruleGenInputSize"
controls-position="right"
/>
</div>
<div class="rule-gen-cell">
<span class="rule-gen-hint">{{ $t('page.configPage.ruleGenRealEvStd') }}</span>
<ElInputNumber
v-model="ruleGenT1RealEv"
class="rule-gen-input-num"
:step="1"
:controls="ruleGenInputControls"
:size="ruleGenInputSize"
controls-position="right"
/>
</div>
</div>
</ElFormItem>
<ElFormItem :label="$t('page.configPage.ruleGenT2Row')">
<div class="rule-gen-row">
<div class="rule-gen-cell">
<span class="rule-gen-hint">{{ $t('page.configPage.ruleGenMinCount') }}</span>
<ElInputNumber
v-model="ruleGenT2Min"
class="rule-gen-input-num"
:min="0"
:max="26"
:step="1"
:controls="ruleGenInputControls"
:size="ruleGenInputSize"
controls-position="right"
/>
</div>
<div class="rule-gen-cell">
<span class="rule-gen-hint">{{ $t('page.configPage.ruleGenRealEvStd') }}</span>
<ElInputNumber
v-model="ruleGenT2RealEv"
class="rule-gen-input-num"
:step="1"
:controls="ruleGenInputControls"
:size="ruleGenInputSize"
controls-position="right"
/>
</div>
</div>
</ElFormItem>
<ElFormItem :label="$t('page.configPage.ruleGenT3RealEvOnly')">
<div class="rule-gen-row">
<div class="rule-gen-cell">
<span class="rule-gen-hint">{{ $t('page.configPage.ruleGenRealEvStd') }}</span>
<ElInputNumber
v-model="ruleGenT3RealEv"
class="rule-gen-input-num"
:step="1"
:controls="ruleGenInputControls"
:size="ruleGenInputSize"
controls-position="right"
/>
</div>
</div>
</ElFormItem>
<ElFormItem :label="$t('page.configPage.ruleGenT4Row')">
<div class="rule-gen-row">
<div class="rule-gen-cell">
<span class="rule-gen-hint">{{ $t('page.configPage.ruleGenFixedCount') }}</span>
<ElInputNumber
v-model="ruleGenT4Fixed"
class="rule-gen-input-num"
:min="0"
:max="26"
:step="1"
:controls="ruleGenInputControls"
:size="ruleGenInputSize"
controls-position="right"
/>
</div>
<div class="rule-gen-cell">
<span class="rule-gen-hint">{{ $t('page.configPage.ruleGenRealEvStd') }}</span>
<ElInputNumber
v-model="ruleGenT4RealEv"
class="rule-gen-input-num"
:step="1"
:controls="ruleGenInputControls"
:size="ruleGenInputSize"
controls-position="right"
/>
</div>
</div>
</ElFormItem>
<ElFormItem :label="$t('page.configPage.ruleGenT5Row')">
<div class="rule-gen-row">
<div class="rule-gen-cell">
<span class="rule-gen-hint">{{ $t('page.configPage.ruleGenFixedCount') }}</span>
<ElInputNumber
v-model="ruleGenT5Fixed"
class="rule-gen-input-num"
:min="0"
:max="26"
:step="1"
:controls="ruleGenInputControls"
:size="ruleGenInputSize"
controls-position="right"
/>
</div>
<div class="rule-gen-cell">
<span class="rule-gen-hint">{{ $t('page.configPage.ruleGenRealEvStd') }}</span>
<ElInputNumber
v-model="ruleGenT5RealEv"
class="rule-gen-input-num"
:disabled="true"
:step="1"
:controls="ruleGenInputControls"
:size="ruleGenInputSize"
controls-position="right"
/>
</div>
</div>
</ElFormItem>
<p class="rule-generate-scope">{{ $t('page.configPage.ruleGenScopeHint') }}</p>
<p class="rule-generate-scope">{{ $t('page.configPage.ruleGenRealEvEditHint') }}</p>
</ElForm>
<template #footer>
<div class="rule-gen-footer-btns">
<ElButton @click="ruleGenerateDialogVisible = false">{{ $t('common.cancel') }}</ElButton>
<ElButton type="primary" :loading="ruleGenSubmitting" @click="handleRuleGenerateApply">
{{ $t('page.configPage.ruleGenApply') }}
</ElButton>
</div>
</template>
</ElDialog>
</div> </div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { useWindowSize } from '@vueuse/core'
import { ElMessage, ElMessageBox } from 'element-plus' import { ElMessage, ElMessageBox } from 'element-plus'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import api from '../../api/reward_config/index' import api from '../../api/reward_config/index'
import {
buildRowsFromTiers,
computeBoardFrequencies,
DEFAULT_TIER_REAL_EV_STANDARDS,
generateTiers,
summarizeCounts,
validateTierRealEvStandards
} from '../utils/generateIndexByRules'
const { t } = useI18n() const { t } = useI18n()
const { width: viewportWidth } = useWindowSize()
/** 窄屏:单列、标签置顶、全屏弹窗 */
const isRuleGenMobile = computed(() => viewportWidth.value < 640)
const ruleGenDialogWidth = computed(() => (isRuleGenMobile.value ? '100%' : 'min(880px, 92vw)'))
const ruleGenFullscreen = computed(() => isRuleGenMobile.value)
const ruleGenFormLabelPosition = computed(() => (isRuleGenMobile.value ? 'top' : 'right'))
const ruleGenFormLabelWidth = computed(() => (isRuleGenMobile.value ? undefined : '168px'))
/** 移动端隐藏步进按钮,避免误触;用系统数字键盘输入 */
const ruleGenInputControls = computed(() => !isRuleGenMobile.value)
const ruleGenInputSize = computed(() => (isRuleGenMobile.value ? 'large' : 'default'))
/** 第一页:奖励索引行(来自 DiceRewardConfig 表) */ /** 第一页:奖励索引行(来自 DiceRewardConfig 表) */
interface IndexRow { interface IndexRow {
id: number id: number
@@ -239,6 +489,31 @@
const savingIndex = ref(false) const savingIndex = ref(false)
const savingBigwin = ref(false) const savingBigwin = ref(false)
const createRewardLoading = ref(false) const createRewardLoading = ref(false)
const ruleGenerateDialogVisible = ref(false)
const ruleGenSubmitting = ref(false)
const ruleGenT1Fixed = ref(3)
const ruleGenT2Min = ref(5)
const ruleGenT4Fixed = ref(1)
const ruleGenT5Fixed = ref(1)
const ruleGenT1RealEv = ref(DEFAULT_TIER_REAL_EV_STANDARDS.T1)
const ruleGenT2RealEv = ref(DEFAULT_TIER_REAL_EV_STANDARDS.T2)
const ruleGenT3RealEv = ref(DEFAULT_TIER_REAL_EV_STANDARDS.T3)
const ruleGenT4RealEv = ref(DEFAULT_TIER_REAL_EV_STANDARDS.T4)
const ruleGenT5RealEv = ref(DEFAULT_TIER_REAL_EV_STANDARDS.T5)
/** 奖励索引 id 与后端 DiceRewardConfigLogic 一致025 */
const REWARD_INDEX_MIN = 0
const REWARD_INDEX_MAX = 25
const ALLOWED_INDEX_TIERS = ['T1', 'T2', 'T3', 'T4', 'T5', 'BIGWIN'] as const
function isAllowedIndexTier(s: string): boolean {
for (let i = 0; i < ALLOWED_INDEX_TIERS.length; i++) {
if (ALLOWED_INDEX_TIERS[i] === s) {
return true
}
}
return false
}
/** 第一页数据(来自 api.list即 DiceRewardConfig 表) */ /** 第一页数据(来自 api.list即 DiceRewardConfig 表) */
const indexRows = ref<IndexRow[]>([]) const indexRows = ref<IndexRow[]>([])
@@ -268,6 +543,31 @@
} }
} }
function calcRealReward(realEv: unknown): number {
const n = typeof realEv === 'number' && !Number.isNaN(realEv) ? realEv : Number(realEv)
if (Number.isNaN(n)) {
return -1
}
return n - 1
}
function handleRealEvChange(row: IndexRow) {
const n =
typeof row.real_ev === 'number' && !Number.isNaN(row.real_ev)
? row.real_ev
: Number(row.real_ev)
const text = Number.isNaN(n) ? '' : Number(n).toFixed(2)
row.ui_text = text
row.ui_text_en = text
}
function formatMoney2(val: unknown): string {
if (val === '' || val === null || val === undefined) return '-'
const n = typeof val === 'number' ? val : Number(val)
if (!Number.isFinite(n)) return '-'
return n.toFixed(2)
}
async function handleCreateRewardReference() { async function handleCreateRewardReference() {
try { try {
await ElMessageBox.confirm( await ElMessageBox.confirm(
@@ -349,8 +649,8 @@
} }
/** 奖励索引表单校验:仅对本表内的行(不含 BIGWIN校验点数 530 且本批内不重复 */ /** 奖励索引表单校验:仅对本表内的行(不含 BIGWIN校验点数 530 且本批内不重复 */
function validateIndexFormForSave(): string | null { function validateIndexFormForSaveRows(rows: IndexRow[]): string | null {
const toSave = indexRows.value.filter((r) => r.tier !== 'BIGWIN') const toSave = rows.filter((r) => r.tier !== 'BIGWIN')
if (toSave.length === 0) { if (toSave.length === 0) {
return t('page.configPage.warnNoIndexToSave') return t('page.configPage.warnNoIndexToSave')
} }
@@ -370,6 +670,171 @@
return null return null
} }
function validateIndexFormForSave(): string | null {
return validateIndexFormForSaveRows(indexRows.value)
}
/** 从当前表提取 id 025 的色子点数(不含 BIGWIN用于按规则生成 */
function extractGrids26(): number[] | null {
const map = new Map<number, number>()
for (const r of indexRows.value) {
if (r.tier === 'BIGWIN') {
continue
}
if (r.id >= REWARD_INDEX_MIN && r.id <= REWARD_INDEX_MAX) {
map.set(r.id, Number(r.grid_number))
}
}
const out: number[] = []
for (let id = REWARD_INDEX_MIN; id <= REWARD_INDEX_MAX; id++) {
if (!map.has(id)) {
return null
}
const gn = map.get(id)
if (gn === undefined || Number.isNaN(gn)) {
return null
}
out.push(gn)
}
return out
}
function openRuleGenerateDialog() {
ruleGenerateDialogVisible.value = true
}
function applyGeneratedRowsToIndex(
items: Array<{
id: number
grid_number: number
ui_text: string
ui_text_en: string
real_ev: number
tier: string
remark: string
}>
): string | null {
const next = indexRows.value.map((r) => ({ ...r }))
for (const item of items) {
const row = next.find((x) => x.id === item.id)
if (row === undefined) {
return t('page.configPage.ruleGenUnknownId', { id: item.id })
}
row.grid_number = item.grid_number
row.ui_text = item.ui_text
row.ui_text_en = item.ui_text_en
row.real_ev = item.real_ev
row.tier = item.tier
row.remark = item.remark
}
const err = validateIndexFormForSaveRows(next)
if (err) {
return err
}
indexRows.value = next
return null
}
async function handleRuleGenerateApply() {
const grids = extractGrids26()
if (grids === null) {
ElMessage.warning(t('page.configPage.ruleGenNeedFullGrid'))
return
}
const t1 = Math.max(0, Math.min(26, Math.floor(Number(ruleGenT1Fixed.value))))
const t2 = Math.max(0, Math.min(26, Math.floor(Number(ruleGenT2Min.value))))
const x4 = Math.max(0, Math.min(26, Math.floor(Number(ruleGenT4Fixed.value))))
const x5 = Math.max(0, Math.min(26, Math.floor(Number(ruleGenT5Fixed.value))))
const standards = {
T1: Number(ruleGenT1RealEv.value),
T2: Number(ruleGenT2RealEv.value),
T3: Number(ruleGenT3RealEv.value),
T4: Number(ruleGenT4RealEv.value),
T5: Number(ruleGenT5RealEv.value)
}
const invalidKey = validateTierRealEvStandards(standards)
if (invalidKey !== null) {
ElMessage.warning(t(`page.configPage.${invalidKey}`))
return
}
const constraints = {
t1FixedCw: t1,
t2MinCw: t2,
t4FixedCw: x4,
t5FixedCw: x5,
t1FixedCcw: t1,
t2MinCcw: t2,
t4FixedCcw: x4,
t5FixedCcw: x5
}
const gen = generateTiers({ grids, constraints })
if (!gen.ok) {
ElMessage.warning(gen.message)
return
}
const built = buildRowsFromTiers(grids, gen.tiers, standards)
const mergeErr = applyGeneratedRowsToIndex(built)
if (mergeErr) {
ElMessage.warning(mergeErr)
return
}
const board = computeBoardFrequencies(grids)
if (board === null) {
ElMessage.warning(t('page.configPage.ruleGenFreqFail'))
return
}
const sc = summarizeCounts(board, gen.tiers)
ruleGenSubmitting.value = true
try {
const indexPayload = built.map(
(r: {
id: number
grid_number: number
ui_text: string
ui_text_en: string
real_ev: number
tier: string
remark: string
}) => ({
id: r.id,
grid_number: r.grid_number,
ui_text: r.ui_text,
ui_text_en: r.ui_text_en,
real_ev: r.real_ev,
tier: r.tier,
remark: r.remark
})
)
await api.batchUpdate(indexPayload)
ElMessage.success(
t('page.configPage.ruleGenSuccess', {
cwT1: sc.cw.T1,
cwT2: sc.cw.T2,
cwT4: sc.cw.T4,
cwT5: sc.cw.T5,
ccT1: sc.ccw.T1,
ccT2: sc.ccw.T2,
ccT4: sc.ccw.T4,
ccT5: sc.ccw.T5
})
)
indexRowsSnapshot = indexRows.value.map((r) => ({ ...r }))
ruleGenerateDialogVisible.value = false
} catch (e: unknown) {
let msg = ''
if (e !== null && typeof e === 'object' && 'message' in e) {
const m = Reflect.get(e, 'message')
if (typeof m === 'string') {
msg = m
}
}
ElMessage.error(msg || t('page.configPage.saveFail'))
loadIndexList()
} finally {
ruleGenSubmitting.value = false
}
}
/** 奖励索引表单仅提交本表数据T1T5不包含大奖权重 */ /** 奖励索引表单仅提交本表数据T1T5不包含大奖权重 */
async function handleSaveIndex() { async function handleSaveIndex() {
const err = validateIndexFormForSave() const err = validateIndexFormForSave()
@@ -551,6 +1016,141 @@
margin-bottom: 12px; margin-bottom: 12px;
line-height: 1.5; line-height: 1.5;
} }
.index-toolbar {
display: flex;
align-items: center;
justify-content: flex-end;
margin-bottom: 8px;
flex-shrink: 0;
}
.rule-generate-dialog {
:deep(.el-dialog__header) {
padding: 12px 16px;
margin-right: 0;
}
:deep(.el-dialog__body) {
padding: 12px 16px 8px;
}
:deep(.el-dialog__footer) {
padding: 12px 16px calc(16px + env(safe-area-inset-bottom, 0px));
}
.rule-generate-rules {
font-size: 12px;
color: var(--el-text-color-secondary);
line-height: 1.65;
white-space: pre-wrap;
margin: 0 0 12px;
padding: 12px;
background: var(--el-fill-color-light);
border-radius: 6px;
max-height: min(260px, 38vh);
overflow-y: auto;
-webkit-overflow-scrolling: touch;
}
.rule-generate-form {
margin-top: 4px;
:deep(.el-form-item) {
margin-bottom: 14px;
}
:deep(.el-form-item__label) {
line-height: 1.4;
align-items: flex-start;
}
}
.rule-generate-scope {
font-size: 12px;
color: var(--el-text-color-secondary);
margin: 8px 0 0;
line-height: 1.5;
}
.rule-gen-row {
display: flex;
flex-wrap: wrap;
align-items: flex-end;
gap: 12px 20px;
width: 100%;
}
.rule-gen-cell {
display: flex;
align-items: center;
gap: 8px;
flex: 1 1 200px;
min-width: 0;
}
.rule-gen-hint {
font-size: 12px;
color: var(--el-text-color-secondary);
white-space: nowrap;
flex-shrink: 0;
}
.rule-gen-input-num {
flex: 1;
min-width: 0;
width: 100%;
max-width: 100%;
}
.rule-gen-input-num :deep(.el-input__wrapper) {
min-height: 36px;
}
.rule-gen-footer-btns {
display: flex;
flex-wrap: wrap;
justify-content: flex-end;
gap: 10px;
width: 100%;
}
}
@media (max-width: 639px) {
.rule-generate-dialog {
:deep(.el-dialog) {
margin: 0;
max-height: 100%;
}
:deep(.el-dialog.is-fullscreen) {
display: flex;
flex-direction: column;
}
:deep(.el-dialog.is-fullscreen .el-dialog__body) {
flex: 1;
min-height: 0;
overflow-y: auto;
-webkit-overflow-scrolling: touch;
}
.rule-generate-rules {
max-height: min(200px, 32vh);
font-size: 11px;
}
.rule-gen-row {
flex-direction: column;
align-items: stretch;
gap: 12px;
}
.rule-gen-cell {
flex-direction: column;
align-items: stretch;
flex: none;
width: 100%;
}
.rule-gen-hint {
white-space: normal;
}
.rule-gen-input-num {
width: 100%;
}
.rule-gen-input-num :deep(.el-input__wrapper) {
min-height: 40px;
}
.rule-gen-footer-btns {
flex-direction: column-reverse;
align-items: stretch;
.el-button {
width: 100%;
margin: 0;
}
}
}
}
.config-table { .config-table {
width: 100%; width: 100%;
.full-width { .full-width {

View File

@@ -22,7 +22,11 @@
<el-input v-model="formData.ui_text_en" :placeholder="$t('page.form.placeholderUiTextEn')" /> <el-input v-model="formData.ui_text_en" :placeholder="$t('page.form.placeholderUiTextEn')" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('page.form.labelRealEv')" prop="real_ev"> <el-form-item :label="$t('page.form.labelRealEv')" prop="real_ev">
<el-input-number v-model="formData.real_ev" :placeholder="$t('page.form.placeholderRealEv')" /> <el-input-number
v-model="formData.real_ev"
:placeholder="$t('page.form.placeholderRealEv')"
@change="handleRealEvChange"
/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('page.form.labelTier')" prop="tier"> <el-form-item :label="$t('page.form.labelTier')" prop="tier">
<el-select <el-select
@@ -237,6 +241,16 @@
console.log('表单验证失败:', error) console.log('表单验证失败:', error)
} }
} }
const handleRealEvChange = () => {
const n =
typeof formData.real_ev === 'number' && !Number.isNaN(formData.real_ev)
? formData.real_ev
: Number(formData.real_ev)
const text = Number.isNaN(n) ? '' : String(n)
formData.ui_text = text
formData.ui_text_en = text
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

View File

@@ -0,0 +1,426 @@
/**
* 按与后端 DiceRewardLogic 一致的环形规则,为盘面 26 格id 025求档位 tier
* 并生成 real_ev / ui 等字段。
*
* 摇取点数为 530起点为 grid_number==摇取点数 的格位下标,顺时针落点 (start+摇取)%26
* 逆时针落点 start-摇取(<0 则 +26
*/
export type IndexTier = 'T1' | 'T2' | 'T3' | 'T4' | 'T5'
/** 豹子摇取点数:这些摇取下落点不得为 T4/T5与 dice_reward 表中「点数」列一致) */
export const LEOPARD_ROLLS: readonly number[] = [5, 10, 15, 20, 25, 30]
const BOARD_SIZE = 26
const GRID_MIN = 5
const GRID_MAX = 30
const T_ALL: IndexTier[] = ['T1', 'T2', 'T3', 'T4', 'T5']
const T_NO_LEOPARD: IndexTier[] = ['T1', 'T2', 'T3']
export interface BoardFrequencies {
grids: number[]
freqCw: number[]
freqCcw: number[]
leopardLandCw: Set<number>
leopardLandCcw: Set<number>
leopardLandUnion: Set<number>
}
/**
* 条数约束T1/T4/T5 为「恰好」T2 为「不少于」(加权条数,与 dice_reward 中顺/逆各 26 条摇取结果一致)
*/
export interface TierCountConstraints {
t1FixedCw: number
t2MinCw: number
/** 顺时针方向 T4 加权条数固定为该值 */
t4FixedCw: number
/** 顺时针方向 T5 加权条数固定为该值 */
t5FixedCw: number
t1FixedCcw: number
t2MinCcw: number
/** 逆时针方向 T4 加权条数固定为该值 */
t4FixedCcw: number
/** 逆时针方向 T5 加权条数固定为该值 */
t5FixedCcw: number
}
/** 各档位统一 real_ev 标准(生成 DiceRewardConfig 时使用;细则可再到表格里改) */
export interface TierRealEvStandards {
T1: number
T2: number
T3: number
T4: number
T5: number
}
/** 默认标准(与规则弹窗说明一致) */
export const DEFAULT_TIER_REAL_EV_STANDARDS: TierRealEvStandards = {
T1: 3,
T2: 1.5,
T3: 0.5,
T4: -0.4,
T5: 0
}
/**
* 校验档位与 real_ev 区间是否一致;通过返回 null否则返回 i18n 键名(不含 page.configPage. 前缀)
*/
export function validateTierRealEvStandards(s: TierRealEvStandards): string | null {
if (!Number.isFinite(s.T1) || !(s.T1 > 2)) {
return 'ruleGenInvalidT1RealEv'
}
if (!Number.isFinite(s.T2) || !(s.T2 > 1 && s.T2 < 2)) {
return 'ruleGenInvalidT2RealEv'
}
if (!Number.isFinite(s.T3) || !(s.T3 > 0 && s.T3 < 1)) {
return 'ruleGenInvalidT3RealEv'
}
if (!Number.isFinite(s.T4) || !(s.T4 < 0)) {
return 'ruleGenInvalidT4RealEv'
}
if (!Number.isFinite(s.T5) || s.T5 !== 0) {
return 'ruleGenInvalidT5RealEv'
}
return null
}
export interface GenerateTierInput {
grids: number[]
constraints: TierCountConstraints
}
export interface GenerateTierResultOk {
ok: true
tiers: IndexTier[]
}
export interface GenerateTierResultFail {
ok: false
message: string
}
export type GenerateTierResult = GenerateTierResultOk | GenerateTierResultFail
export function computeBoardFrequencies(grids: number[]): BoardFrequencies | null {
if (grids.length !== BOARD_SIZE) {
return null
}
const gridToPos: Record<number, number> = {}
for (let pos = 0; pos < BOARD_SIZE; pos++) {
const g = grids[pos]
if (g < GRID_MIN || g > GRID_MAX) {
return null
}
if (gridToPos[g] !== undefined) {
return null
}
gridToPos[g] = pos
}
const freqCw = new Array<number>(BOARD_SIZE).fill(0)
const freqCcw = new Array<number>(BOARD_SIZE).fill(0)
for (let roll = GRID_MIN; roll <= GRID_MAX; roll++) {
const startPos = gridToPos[roll]
const endCw = (startPos + roll) % BOARD_SIZE
const endCcw = startPos - roll >= 0 ? startPos - roll : BOARD_SIZE + startPos - roll
freqCw[endCw]++
freqCcw[endCcw]++
}
const leopardLandCw = new Set<number>()
const leopardLandCcw = new Set<number>()
for (let di = 0; di < LEOPARD_ROLLS.length; di++) {
const d = LEOPARD_ROLLS[di]
const sp = gridToPos[d]
leopardLandCw.add((sp + d) % BOARD_SIZE)
const eccw = sp - d >= 0 ? sp - d : BOARD_SIZE + sp - d
leopardLandCcw.add(eccw)
}
const leopardLandUnion = new Set<number>()
leopardLandCw.forEach((x) => leopardLandUnion.add(x))
leopardLandCcw.forEach((x) => leopardLandUnion.add(x))
return {
grids: [...grids],
freqCw,
freqCcw,
leopardLandCw,
leopardLandCcw,
leopardLandUnion
}
}
function sumWeighted(freq: number[], tiers: IndexTier[], tier: IndexTier): number {
let s = 0
for (let i = 0; i < BOARD_SIZE; i++) {
if (tiers[i] === tier) {
s += freq[i]
}
}
return s
}
function meetsConstraints(
tiers: IndexTier[],
freqCw: number[],
freqCcw: number[],
c: TierCountConstraints
): boolean {
const cw1 = sumWeighted(freqCw, tiers, 'T1')
const cw2 = sumWeighted(freqCw, tiers, 'T2')
const cw4 = sumWeighted(freqCw, tiers, 'T4')
const cw5 = sumWeighted(freqCw, tiers, 'T5')
const cc1 = sumWeighted(freqCcw, tiers, 'T1')
const cc2 = sumWeighted(freqCcw, tiers, 'T2')
const cc4 = sumWeighted(freqCcw, tiers, 'T4')
const cc5 = sumWeighted(freqCcw, tiers, 'T5')
return (
cw1 === c.t1FixedCw &&
cw2 >= c.t2MinCw &&
cw4 === c.t4FixedCw &&
cw5 === c.t5FixedCw &&
cc1 === c.t1FixedCcw &&
cc2 >= c.t2MinCcw &&
cc4 === c.t4FixedCcw &&
cc5 === c.t5FixedCcw
)
}
function nonLeopardTierChoices(c: TierCountConstraints): IndexTier[] {
const out: IndexTier[] = ['T1', 'T2', 'T3']
if (c.t4FixedCw > 0 || c.t4FixedCcw > 0) {
out.push('T4')
}
if (c.t5FixedCw > 0 || c.t5FixedCcw > 0) {
out.push('T5')
}
return out
}
function shuffleIndices(rand: () => number): number[] {
const a: number[] = []
for (let i = 0; i < BOARD_SIZE; i++) {
a.push(i)
}
for (let i = BOARD_SIZE - 1; i > 0; i--) {
const j = Math.floor(rand() * (i + 1))
const t = a[i]
a[i] = a[j]
a[j] = t
}
return a
}
function mulberry32(seed: number): () => number {
return () => {
let t = (seed += 0x6d2b79f5)
t = Math.imul(t ^ (t >>> 15), t | 1)
t ^= t + Math.imul(t ^ (t >>> 7), t | 61)
return ((t ^ (t >>> 14)) >>> 0) / 4294967296
}
}
/**
* 随机搜索可行档位:豹子落点禁 T4/T5T4/T5 顺/逆加权条数分别等于约束中的固定值(可多条 T4/T5 格位)。
*/
export function generateTiers(input: GenerateTierInput): GenerateTierResult {
const board = computeBoardFrequencies(input.grids)
if (board === null) {
return { ok: false, message: 'grid_number 须为 530 各出现一次且共 26 条' }
}
const { freqCw, freqCcw, leopardLandUnion } = board
const c = input.constraints
let seed = 0
for (let i = 0; i < BOARD_SIZE; i++) {
seed = (seed + input.grids[i] * 31 + i) | 0
}
const rand = mulberry32(seed === 0 ? 0x9e3779b9 : seed)
const needT5Cell = c.t5FixedCw > 0 || c.t5FixedCcw > 0
if (needT5Cell) {
let hasNonLeopard = false
for (let i = 0; i < BOARD_SIZE; i++) {
if (!leopardLandUnion.has(i)) {
hasNonLeopard = true
break
}
}
if (!hasNonLeopard) {
return { ok: false, message: '无可用 T5 格位(豹子摇取落点占满全盘,请调整 grid_number 排布)' }
}
}
const nonLeopardChoices = nonLeopardTierChoices(c)
const maxAttempts = 400000
for (let attempt = 0; attempt < maxAttempts; attempt++) {
const tiers: IndexTier[] = new Array(BOARD_SIZE).fill('T3')
const order = shuffleIndices(rand)
for (let oi = 0; oi < order.length; oi++) {
const pos = order[oi]
if (leopardLandUnion.has(pos)) {
tiers[pos] = T_NO_LEOPARD[Math.floor(rand() * T_NO_LEOPARD.length)]
} else {
tiers[pos] = nonLeopardChoices[Math.floor(rand() * nonLeopardChoices.length)]
}
}
if (meetsConstraints(tiers, freqCw, freqCcw, c)) {
return { ok: true, tiers }
}
}
return { ok: false, message: '在当前盘面与约束下未找到可行解,请调整 T1/T4/T5 固定条数或放宽 T2 下限后重试' }
}
function uiTextByTierWhenStandards(
tier: IndexTier,
realEv: number
): { ui_text: string; ui_text_en: string } {
if (tier === 'T5') {
return { ui_text: '再来一次', ui_text_en: 'Once again' }
}
const value = Number.isFinite(realEv) ? realEv.toFixed(2) : String(realEv)
return { ui_text: value, ui_text_en: value }
}
/** 展示文案:直接使用真实结算值(中英文相同) */
function uiTextFromRealEv(realEv: number): { ui_text: string; ui_text_en: string } {
const value = Number.isFinite(realEv) ? realEv.toFixed(2) : String(realEv)
return { ui_text: value, ui_text_en: value }
}
/**
* 按 tier 生成展示字段。
* @param standards 若传入,则各档位统一使用对应 real_ev 标准;不传则使用内置随机占位(兼容脚本/旧逻辑)
*/
export function buildRowsFromTiers(
grids: number[],
tiers: IndexTier[],
standards?: TierRealEvStandards
): Array<{
id: number
grid_number: number
ui_text: string
ui_text_en: string
real_ev: number
tier: IndexTier
remark: string
}> {
const rows: Array<{
id: number
grid_number: number
ui_text: string
ui_text_en: string
real_ev: number
tier: IndexTier
remark: string
}> = []
let t4Seq = 0
for (let id = 0; id < BOARD_SIZE; id++) {
const tier = tiers[id]
const grid_number = grids[id]
let ui_text = ''
let ui_text_en = ''
let real_ev = 0
let remark = ''
if (standards !== undefined) {
if (tier === 'T1') {
real_ev = standards.T1
const f = uiTextByTierWhenStandards(tier, 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 = uiTextByTierWhenStandards(tier, 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 = uiTextByTierWhenStandards(tier, 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 = uiTextByTierWhenStandards(tier, real_ev)
ui_text = f.ui_text
ui_text_en = f.ui_text_en
remark = '惩罚'
} else {
real_ev = standards.T5
const f = uiTextByTierWhenStandards(tier, real_ev)
ui_text = f.ui_text
ui_text_en = f.ui_text_en
remark = '前端需要在播放一次动画(特殊)'
}
} else if (tier === 'T1') {
real_ev = 101 + ((id * 17 + grid_number * 3) % 398)
if (real_ev >= 500) {
real_ev = 498
}
const f = uiTextFromRealEv(real_ev)
ui_text = f.ui_text
ui_text_en = f.ui_text_en
remark = '大奖格'
} else if (tier === 'T2') {
if (id % 3 === 0) {
real_ev = 1
remark = '完美回本'
} else {
real_ev = 20 + ((id * 11) % 75)
if (real_ev <= 0) {
real_ev = 50
}
remark = '小赚'
}
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 = 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 = uiTextFromRealEv(real_ev)
ui_text = f.ui_text
ui_text_en = f.ui_text_en
remark = '惩罚'
} else {
real_ev = 0
const f = uiTextFromRealEv(real_ev)
ui_text = f.ui_text
ui_text_en = f.ui_text_en
remark = '前端需要在播放一次动画(特殊)'
}
rows.push({
id,
grid_number,
ui_text,
ui_text_en,
real_ev,
tier,
remark
})
}
return rows
}
export function summarizeCounts(
board: BoardFrequencies,
tiers: IndexTier[]
): { cw: Record<IndexTier, number>; ccw: Record<IndexTier, number> } {
const cw: Record<IndexTier, number> = { T1: 0, T2: 0, T3: 0, T4: 0, T5: 0 }
const ccw: Record<IndexTier, number> = { T1: 0, T2: 0, T3: 0, T4: 0, T5: 0 }
for (let k = 0; k < T_ALL.length; k++) {
const t = T_ALL[k]
cw[t] = sumWeighted(board.freqCw, tiers, t)
ccw[t] = sumWeighted(board.freqCcw, tiers, t)
}
return { cw, ccw }
}

View File

@@ -40,19 +40,18 @@
<template #status="{ row }"> <template #status="{ row }">
<span>{{ formatStatus(row.status) }}</span> <span>{{ formatStatus(row.status) }}</span>
</template> </template>
<!-- 付费抽取顺时针逆时针抽取次数兼容旧数据用 s_count/n_count --> <!-- 付费抽取顺时针逆时针抽取次数 -->
<template #paid_draw="{ row }"> <template #paid_draw="{ row }">
<span <span
>{{ $t('page.table.clockwiseAbbr') }} {{ getPaidS(row) }} / >{{ $t('page.table.clockwiseAbbr') }} {{ getPaidS(row) }} /
{{ $t('page.table.counterclockwiseAbbr') }} {{ getPaidN(row) }}</span {{ $t('page.table.counterclockwiseAbbr') }} {{ getPaidN(row) }}</span
> >
</template> </template>
<!-- 免费抽取顺时针逆时针抽取次数 --> <template #chain_mode="{ row }">
<template #free_draw="{ row }"> <span>{{ formatChainMode(row) }}</span>
<span </template>
>{{ $t('page.table.clockwiseAbbr') }} {{ row.free_s_count ?? 0 }} / <template #total_draw="{ row }">
{{ $t('page.table.counterclockwiseAbbr') }} {{ row.free_n_count ?? 0 }}</span <span>{{ formatTotalDraw(row) }}</span>
>
</template> </template>
<!-- 平台赚取金额 --> <!-- 平台赚取金额 -->
<template #platform_profit="{ row }"> <template #platform_profit="{ row }">
@@ -136,16 +135,12 @@
return t('page.detail.dash') return t('page.detail.dash')
} }
// 付费抽取次数(兼容旧数据:无 paid_s_count 时用 s_count // 付费抽取次数
function getPaidS(row: Record<string, any>): number { function getPaidS(row: Record<string, any>): number {
const v = row.paid_s_count return Number(row.paid_s_count ?? 0)
if (v !== undefined && v !== null && (Number(v) || 0) > 0) return Number(v)
return Number(row.s_count ?? 0)
} }
function getPaidN(row: Record<string, any>): number { function getPaidN(row: Record<string, any>): number {
const v = row.paid_n_count return Number(row.paid_n_count ?? 0)
if (v !== undefined && v !== null && (Number(v) || 0) > 0) return Number(v)
return Number(row.n_count ?? 0)
} }
// 平台赚取金额展示(未完成或空显示 —) // 平台赚取金额展示(未完成或空显示 —)
@@ -154,7 +149,32 @@
if (v === null || v === undefined || v === '') return dash if (v === null || v === undefined || v === '') return dash
const n = Number(v) const n = Number(v)
if (Number.isNaN(n)) return dash if (Number.isNaN(n)) return dash
return String(n) return n.toFixed(2)
}
/** 链式再来一次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 })
} }
// 表格配置 // 表格配置
@@ -193,12 +213,30 @@
useSlot: true useSlot: true
}, },
{ {
prop: 'free_draw', prop: 'chain_mode',
label: 'page.table.freeDraw', label: 'page.table.chainMode',
width: 160, width: 110,
align: 'center', align: 'center',
useSlot: true useSlot: true
}, },
{
prop: 'paid_planned_spins',
label: 'page.table.paidPlannedSpins',
width: 120,
align: 'center'
},
{
prop: 'ante',
label: 'page.table.ante',
width: 90,
align: 'center'
},
{
prop: 'play_again_count',
label: 'page.table.playAgainCount',
width: 120,
align: 'center'
},
{ {
prop: 'platform_profit', prop: 'platform_profit',
label: 'page.table.platformProfit', label: 'page.table.platformProfit',
@@ -206,7 +244,13 @@
align: 'center', align: 'center',
useSlot: true 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', prop: 'admin_name',
label: 'page.table.createdBy', label: 'page.table.createdBy',
@@ -214,6 +258,13 @@
align: 'center', align: 'center',
showOverflowTooltip: true showOverflowTooltip: true
}, },
{
prop: 'remark',
label: 'page.table.remark',
width: 220,
align: 'center',
showOverflowTooltip: true
},
{ prop: 'create_time', label: 'page.table.createTime', width: 170, align: 'center' }, { prop: 'create_time', label: 'page.table.createTime', width: 170, align: 'center' },
{ {
prop: 'operation', prop: 'operation',

View File

@@ -14,9 +14,15 @@
<el-descriptions-item :label="$t('page.detail.recordId')"> <el-descriptions-item :label="$t('page.detail.recordId')">
{{ record.id }} {{ record.id }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('page.detail.testCount')" <el-descriptions-item :label="$t('page.detail.chainModeLabel')">
>{{ record.test_count }}{{ $t('page.detail.testCountSuffix') }}</el-descriptions-item {{ 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')"> <el-descriptions-item :label="$t('page.detail.createTime')">
{{ record.create_time || $t('page.detail.dash') }} {{ record.create_time || $t('page.detail.dash') }}
</el-descriptions-item> </el-descriptions-item>
@@ -231,6 +237,11 @@
interface RecordRow { interface RecordRow {
id?: number id?: number
test_count?: number test_count?: number
total_play_count?: number
status?: number
over_play_count?: number
chain_free_mode?: number | boolean | string
paid_planned_spins?: number
create_time?: string create_time?: string
admin_id?: number | null admin_id?: number | null
admin_name?: string admin_name?: string
@@ -238,7 +249,6 @@
paid_lottery_config_id?: number | null paid_lottery_config_id?: number | null
free_lottery_config_id?: number | null free_lottery_config_id?: number | null
bigwin_weight?: Record<string, number> | Array<[number, number]> | null bigwin_weight?: Record<string, number> | Array<[number, number]> | null
// 新结构:{ paid: {T1..T5}, free: {T1..T5} },兼容旧结构直接是 {T1..T5}
tier_weights_snapshot?: tier_weights_snapshot?:
| { | {
paid?: Record<string, number> paid?: Record<string, number>
@@ -257,6 +267,32 @@
result_counts?: Record<string, number> 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 { interface Props {
modelValue: boolean modelValue: boolean
record: RecordRow | null record: RecordRow | null

View File

@@ -8,6 +8,32 @@
@search="handleSearch" @search="handleSearch"
@expand="handleExpand" @expand="handleExpand"
> >
<el-col v-bind="setSpan(6)">
<el-form-item :label="$t('page.search.paidPlannedSpins')" prop="paid_planned_spins">
<el-input-number
v-model="formData.paid_planned_spins"
:placeholder="$t('table.searchBar.all')"
:min="0"
:precision="0"
:step="1"
controls-position="right"
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col v-bind="setSpan(6)">
<el-form-item :label="$t('page.search.ante')" prop="ante">
<el-input-number
v-model="formData.ante"
:placeholder="$t('table.searchBar.all')"
:min="1"
:precision="0"
:step="1"
controls-position="right"
style="width: 100%"
/>
</el-form-item>
</el-col>
</sa-search-bar> </sa-search-bar>
</template> </template>

View File

@@ -143,6 +143,7 @@
import { ref } from 'vue' import { ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus' import { ElMessage, ElMessageBox } from 'element-plus'
import { useTerminalStore, TaskStatus } from '../store/terminal' import { useTerminalStore, TaskStatus } from '../store/terminal'
import { $t } from '@/locales'
const emit = defineEmits<{ const emit = defineEmits<{
(e: 'success'): void (e: 'success'): void
@@ -157,51 +158,51 @@
} }
const webBuild = () => { const webBuild = () => {
ElMessageBox.confirm('确认重新打包前端并发布项目吗?', '前端打包发布', { ElMessageBox.confirm($t('uiMsg.saipackageWebBuildConfirm'), $t('uiMsg.saipackageWebBuildTitle'), {
confirmButtonText: '确定', confirmButtonText: $t('uiMsg.btnOk'),
cancelButtonText: '取消', cancelButtonText: $t('uiMsg.btnCancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
terminal.addNodeTask('web-build', '', () => { terminal.addNodeTask('web-build', '', () => {
ElMessage.success('前端打包发布成功') ElMessage.success($t('uiMsg.saipackageWebBuildSuccess'))
}) })
}) })
} }
const handleFronted = () => { const handleFronted = () => {
ElMessageBox.confirm('确认更新前端Node依赖吗', '前端依赖更新', { ElMessageBox.confirm($t('uiMsg.saipackageFrontendDepsConfirm'), $t('uiMsg.saipackageFrontendDepsTitle'), {
confirmButtonText: '确定', confirmButtonText: $t('uiMsg.btnOk'),
cancelButtonText: '取消', cancelButtonText: $t('uiMsg.btnCancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
terminal.addNodeTask('web-install', '', () => { terminal.addNodeTask('web-install', '', () => {
ElMessage.success('前端依赖更新成功') ElMessage.success($t('uiMsg.saipackageFrontendDepsSuccess'))
}) })
}) })
} }
const handleBackend = () => { const handleBackend = () => {
ElMessageBox.confirm('确认更新后端composer包吗', 'composer包更新', { ElMessageBox.confirm($t('uiMsg.saipackageComposerConfirm'), $t('uiMsg.saipackageComposerTitle'), {
confirmButtonText: '确定', confirmButtonText: $t('uiMsg.btnOk'),
cancelButtonText: '取消', cancelButtonText: $t('uiMsg.btnCancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
terminal.addTask('composer.update', '', () => { terminal.addTask('composer.update', '', () => {
ElMessage.success('composer包更新成功') ElMessage.success($t('uiMsg.saipackageComposerSuccess'))
}) })
}) })
} }
const frontInstall = (extend = '') => { const frontInstall = (extend = '') => {
terminal.addNodeTask('web-install', extend, () => { terminal.addNodeTask('web-install', extend, () => {
ElMessage.success('前端依赖更新成功') ElMessage.success($t('uiMsg.saipackageFrontendDepsSuccess'))
emit('success') emit('success')
}) })
} }
const backendInstall = (extend = '') => { const backendInstall = (extend = '') => {
terminal.addTask('composer.update', extend, () => { terminal.addTask('composer.update', extend, () => {
ElMessage.success('composer包更新成功') ElMessage.success($t('uiMsg.saipackageComposerSuccess'))
setTimeout(() => { setTimeout(() => {
emit('success') emit('success')
}, 500) }, 500)

View File

@@ -186,6 +186,7 @@
import api from '@/api/safeguard/server' import api from '@/api/safeguard/server'
import { onMounted } from 'vue' import { onMounted } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus' import { ElMessage, ElMessageBox } from 'element-plus'
import { $t } from '@/locales'
const loading = ref(false) const loading = ref(false)
@@ -219,16 +220,16 @@
*/ */
const handleClearCache = (tag: string): void => { const handleClearCache = (tag: string): void => {
if (!tag) { if (!tag) {
ElMessage.warning('请选择要清理的缓存') ElMessage.warning($t('uiMsg.clearCacheSelect'))
return return
} }
ElMessageBox.confirm(`确定要清理标签:【${tag}】的缓存吗?`, '清理选中缓存', { ElMessageBox.confirm($t('uiMsg.clearCacheConfirmByTag', { tag }), $t('uiMsg.clearCacheTitle'), {
confirmButtonText: '确定', confirmButtonText: $t('uiMsg.btnOk'),
cancelButtonText: '取消', cancelButtonText: $t('uiMsg.btnCancel'),
type: 'error' type: 'error'
}).then(() => { }).then(() => {
api.clear({ tag }).then(() => { api.clear({ tag }).then(() => {
ElMessage.success('操作成功') ElMessage.success($t('uiMsg.operationSuccess'))
updateCacheInfo() updateCacheInfo()
}) })
}) })

View File

@@ -84,7 +84,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { useTable } from '@/hooks/core/useTable' import { useTable } from '@/hooks/core/useTable'
import { useSaiAdmin } from '@/composables/useSaiAdmin' import { useSaiAdmin } from '@/composables/useSaiAdmin'
import { ElMessageBox } from 'element-plus' import { ElMessage, ElMessageBox } from 'element-plus'
import { $t } from '@/locales'
import api from '@/api/safeguard/database' import api from '@/api/safeguard/database'
import TableSearch from './modules/table-search.vue' import TableSearch from './modules/table-search.vue'
import TableDialog from './modules/table-dialog.vue' import TableDialog from './modules/table-dialog.vue'
@@ -126,7 +127,12 @@
columnsFactory: () => [ columnsFactory: () => [
{ type: 'selection' }, { type: 'selection' },
{ prop: 'name', label: 'page.table.tableName', minWidth: 200 }, { prop: 'name', label: 'page.table.tableName', minWidth: 200 },
{ prop: 'comment', label: 'page.table.tableComment', minWidth: 150, showOverflowTooltip: true }, {
prop: 'comment',
label: 'page.table.tableComment',
minWidth: 150,
showOverflowTooltip: true
},
{ prop: 'engine', label: 'page.table.tableEngine', width: 120 }, { prop: 'engine', label: 'page.table.tableEngine', width: 120 },
{ prop: 'update_time', label: 'page.table.updateTime', width: 180, sortable: true }, { prop: 'update_time', label: 'page.table.updateTime', width: 180, sortable: true },
{ prop: 'rows', label: 'page.table.totalRows', width: 120 }, { prop: 'rows', label: 'page.table.totalRows', width: 120 },
@@ -134,7 +140,13 @@
{ prop: 'data_length', label: 'page.table.dataSize', width: 120 }, { prop: 'data_length', label: 'page.table.dataSize', width: 120 },
{ prop: 'collation', label: 'page.table.collation', width: 180 }, { prop: 'collation', label: 'page.table.collation', width: 180 },
{ prop: 'create_time', label: 'page.table.createTime', width: 180, sortable: true }, { prop: 'create_time', label: 'page.table.createTime', width: 180, sortable: true },
{ prop: 'operation', label: 'table.actions.operation', width: 100, fixed: 'right', useSlot: true } {
prop: 'operation',
label: 'table.actions.operation',
width: 100,
fixed: 'right',
useSlot: true
}
] ]
} }
}) })
@@ -167,20 +179,20 @@
*/ */
const handleOptimizeRows = (): void => { const handleOptimizeRows = (): void => {
if (selectedRows.value.length === 0) { if (selectedRows.value.length === 0) {
ElMessage.warning('请选择要优化的行') ElMessage.warning($t('page.ui.selectRowsToOptimize'))
return return
} }
ElMessageBox.confirm( ElMessageBox.confirm(
`确定要优化选中的 ${selectedRows.value.length} 条数据吗?`, $t('page.ui.optimizeConfirm', { n: selectedRows.value.length }),
'优化选中数据', $t('page.ui.optimizeTitle'),
{ {
confirmButtonText: '确定', confirmButtonText: $t('uiMsg.btnOk'),
cancelButtonText: '取消', cancelButtonText: $t('uiMsg.btnCancel'),
type: 'error' type: 'error'
} }
).then(() => { ).then(() => {
api.optimize({ tables: selectedRows.value.map((row) => row.name) }).then(() => { api.optimize({ tables: selectedRows.value.map((row) => row.name) }).then(() => {
ElMessage.success('操作成功') ElMessage.success($t('uiMsg.operationSuccess'))
refreshData() refreshData()
selectedRows.value = [] selectedRows.value = []
}) })
@@ -192,20 +204,20 @@
*/ */
const handleFragmentRows = (): void => { const handleFragmentRows = (): void => {
if (selectedRows.value.length === 0) { if (selectedRows.value.length === 0) {
ElMessage.warning('请选择要清理碎片的行') ElMessage.warning($t('page.ui.selectRowsToFragment'))
return return
} }
ElMessageBox.confirm( ElMessageBox.confirm(
`确定要清理选中的 ${selectedRows.value.length} 条数据吗?`, $t('page.ui.fragmentConfirm', { n: selectedRows.value.length }),
'清理碎片操作', $t('page.ui.fragmentTitle'),
{ {
confirmButtonText: '确定', confirmButtonText: $t('uiMsg.btnOk'),
cancelButtonText: '取消', cancelButtonText: $t('uiMsg.btnCancel'),
type: 'error' type: 'error'
} }
).then(() => { ).then(() => {
api.fragment({ tables: selectedRows.value.map((row) => row.name) }).then(() => { api.fragment({ tables: selectedRows.value.map((row) => row.name) }).then(() => {
ElMessage.success('操作成功') ElMessage.success($t('uiMsg.operationSuccess'))
refreshData() refreshData()
selectedRows.value = [] selectedRows.value = []
}) })

View File

@@ -129,7 +129,8 @@
import { useTable } from '@/hooks/core/useTable' import { useTable } from '@/hooks/core/useTable'
import { useSaiAdmin } from '@/composables/useSaiAdmin' import { useSaiAdmin } from '@/composables/useSaiAdmin'
import { useUserStore } from '@/store/modules/user' import { useUserStore } from '@/store/modules/user'
import { ElMessageBox } from 'element-plus' import { ElMessage, ElMessageBox } from 'element-plus'
import { $t } from '@/locales'
import TableSearch from './modules/table-search.vue' import TableSearch from './modules/table-search.vue'
import EditDialog from './modules/edit-dialog.vue' import EditDialog from './modules/edit-dialog.vue'
import WorkDialog from './modules/work-dialog.vue' import WorkDialog from './modules/work-dialog.vue'
@@ -252,15 +253,15 @@
* @param row * @param row
*/ */
const handlePassword = (row: any) => { const handlePassword = (row: any) => {
ElMessageBox.prompt('请输入新密码', '提示', { ElMessageBox.prompt($t('page.ui.promptNewPassword'), $t('uiMsg.titlePrompt'), {
confirmButtonText: '确定', confirmButtonText: $t('uiMsg.btnOk'),
cancelButtonText: '取消', cancelButtonText: $t('uiMsg.btnCancel'),
inputPattern: /^.{6,16}$/, inputPattern: /^.{6,16}$/,
inputErrorMessage: '密码长度在6到16之间', inputErrorMessage: $t('page.ui.passwordLengthError'),
type: 'warning' type: 'warning'
}).then(({ value }) => { }).then(({ value }) => {
api.changePassword({ id: row.id, password: value }).then(() => { api.changePassword({ id: row.id, password: value }).then(() => {
ElMessage.success('修改密码成功') ElMessage.success($t('page.ui.passwordChanged'))
}) })
}) })
} }
@@ -270,13 +271,13 @@
* @param row * @param row
*/ */
const handleCache = (row: any) => { const handleCache = (row: any) => {
ElMessageBox.confirm('确定要清理缓存吗?', '提示', { ElMessageBox.confirm($t('page.ui.clearCacheConfirm'), $t('uiMsg.titlePrompt'), {
confirmButtonText: '确定', confirmButtonText: $t('uiMsg.btnOk'),
cancelButtonText: '取消', cancelButtonText: $t('uiMsg.btnCancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
api.clearCache({ id: row.id }).then(() => { api.clearCache({ id: row.id }).then(() => {
ElMessage.success('清理缓存成功') ElMessage.success($t('uiMsg.clearCacheSuccess'))
}) })
}) })
} }

View File

@@ -80,6 +80,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { $t } from '@/locales'
import api from '@/api/safeguard/database' import api from '@/api/safeguard/database'
import { useTable } from '@/hooks/core/useTable' import { useTable } from '@/hooks/core/useTable'
import generate from '@/api/tool/generate' import generate from '@/api/tool/generate'
@@ -172,7 +173,7 @@
// 确认选择装载数据表 // 确认选择装载数据表
const handleLoadTable = async () => { const handleLoadTable = async () => {
if (selectedRows.value.length < 1) { if (selectedRows.value.length < 1) {
ElMessage.info('至少要选择一条数据') ElMessage.info($t('uiMsg.selectAtLeastOne'))
return return
} }
const names = selectedRows.value.map((item) => ({ const names = selectedRows.value.map((item) => ({
@@ -185,7 +186,7 @@
source: searchForm.value.source, source: searchForm.value.source,
names names
}) })
ElMessage.success('装载成功') ElMessage.success($t('page.ui.loadSuccess'))
emit('success') emit('success')
handleClose() handleClose()
} }

View File

@@ -24,6 +24,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { useClipboard } from '@vueuse/core' import { useClipboard } from '@vueuse/core'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { $t } from '@/locales'
import generate from '@/api/tool/generate' import generate from '@/api/tool/generate'
interface Props { interface Props {
@@ -94,9 +95,9 @@
const handleCopy = async (code: string) => { const handleCopy = async (code: string) => {
try { try {
await copy(code) await copy(code)
ElMessage.success('代码已复制到剪贴板') ElMessage.success($t('page.ui.copyToClipboard'))
} catch { } catch {
ElMessage.error('复制失败,请手动复制') ElMessage.error($t('uiMsg.copyFail'))
} }
} }
</script> </script>

View File

@@ -133,6 +133,7 @@
import { useTable } from '@/hooks/core/useTable' import { useTable } from '@/hooks/core/useTable'
import { useSaiAdmin } from '@/composables/useSaiAdmin' import { useSaiAdmin } from '@/composables/useSaiAdmin'
import { ElMessage, ElMessageBox } from 'element-plus' import { ElMessage, ElMessageBox } from 'element-plus'
import { $t } from '@/locales'
import api from '@/api/tool/generate' import api from '@/api/tool/generate'
import { downloadFile } from '@/utils/tool' import { downloadFile } from '@/utils/tool'
@@ -211,15 +212,15 @@
* 生成代码下载 * 生成代码下载
*/ */
const generateCode = async (ids: number | string) => { const generateCode = async (ids: number | string) => {
ElMessage.info('代码生成下载中,请稍后') ElMessage.info($t('page.ui.generating'))
const response = await api.generateCode({ const response = await api.generateCode({
ids: ids.toString().split(',') ids: ids.toString().split(',')
}) })
if (response) { if (response) {
downloadFile(response, 'code.zip') downloadFile(response, 'code.zip')
ElMessage.success('代码生成成功,开始下载') ElMessage.success($t('page.ui.generateSuccess'))
} else { } else {
ElMessage.error('文件下载失败') ElMessage.error($t('page.ui.downloadFail'))
} }
} }
@@ -227,13 +228,13 @@
* 同步表结构 * 同步表结构
*/ */
const syncTable = async (id: number) => { const syncTable = async (id: number) => {
ElMessageBox.confirm('执行同步操作将会覆盖已经设置的表结构,确定要同步吗?', '提示', { ElMessageBox.confirm($t('page.ui.syncConfirm'), $t('uiMsg.titlePrompt'), {
confirmButtonText: '确定', confirmButtonText: $t('uiMsg.btnOk'),
cancelButtonText: '取消', cancelButtonText: $t('uiMsg.btnCancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
api.async({ id }).then(() => { api.async({ id }).then(() => {
ElMessage.success('同步成功') ElMessage.success($t('page.ui.syncSuccess'))
}) })
}) })
} }
@@ -242,13 +243,13 @@
* 生成到项目 * 生成到项目
*/ */
const generateFile = async (id: number) => { const generateFile = async (id: number) => {
ElMessageBox.confirm('生成到项目将会覆盖原有文件,确定要生成吗?', '提示', { ElMessageBox.confirm($t('page.ui.generateToProjectConfirm'), $t('uiMsg.titlePrompt'), {
confirmButtonText: '确定', confirmButtonText: $t('uiMsg.btnOk'),
cancelButtonText: '取消', cancelButtonText: $t('uiMsg.btnCancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
api.generateFile({ id }).then(() => { api.generateFile({ id }).then(() => {
ElMessage.success('生成到项目成功') ElMessage.success($t('page.ui.generateToProjectSuccess'))
}) })
}) })
} }
@@ -258,7 +259,7 @@
*/ */
const batchGenerate = () => { const batchGenerate = () => {
if (selectedRows.value.length === 0) { if (selectedRows.value.length === 0) {
ElMessage.error('至少要选择一条数据') ElMessage.error($t('uiMsg.selectAtLeastOne'))
return return
} }
generateCode(selectedRows.value.map((item: any) => item.id).join(',')) generateCode(selectedRows.value.map((item: any) => item.id).join(','))

View File

@@ -79,6 +79,7 @@
import { useTable } from '@/hooks/core/useTable' import { useTable } from '@/hooks/core/useTable'
import { useSaiAdmin } from '@/composables/useSaiAdmin' import { useSaiAdmin } from '@/composables/useSaiAdmin'
import { ElMessage, ElMessageBox } from 'element-plus' import { ElMessage, ElMessageBox } from 'element-plus'
import { $t } from '@/locales'
import api from '@/api/tool/crontab' import api from '@/api/tool/crontab'
import TableSearch from './modules/table-search.vue' import TableSearch from './modules/table-search.vue'
import EditDialog from './modules/edit-dialog.vue' import EditDialog from './modules/edit-dialog.vue'
@@ -146,13 +147,13 @@
// 运行任务 // 运行任务
const handleRun = (row: any) => { const handleRun = (row: any) => {
ElMessageBox.confirm(`确定要运行任务【${row.name}】吗?`, '运行任务', { ElMessageBox.confirm($t('page.ui.runConfirm', { name: row.name }), $t('page.ui.runTitle'), {
confirmButtonText: '确定', confirmButtonText: $t('uiMsg.btnOk'),
cancelButtonText: '取消', cancelButtonText: $t('uiMsg.btnCancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
api.run({ id: row.id }).then(() => { api.run({ id: row.id }).then(() => {
ElMessage.success('任务运行成功') ElMessage.success($t('page.ui.runSuccess'))
refreshData() refreshData()
}) })
}) })

View File

@@ -76,6 +76,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { ElMessage, ElMessageBox } from 'element-plus' import { ElMessage, ElMessageBox } from 'element-plus'
import { $t } from '@/locales'
import api from '@/api/tool/crontab' import api from '@/api/tool/crontab'
import { useTable } from '@/hooks/core/useTable' import { useTable } from '@/hooks/core/useTable'
@@ -128,7 +129,7 @@
*/ */
const initPage = async () => { const initPage = async () => {
if (!props.data?.id) { if (!props.data?.id) {
ElMessage.error('请先选择一个任务') ElMessage.error($t('page.ui.selectTaskFirst'))
return return
} }
searchForm.value.crontab_id = props.data.id searchForm.value.crontab_id = props.data.id
@@ -166,20 +167,20 @@
// 确认选择装载数据表 // 确认选择装载数据表
const handleLoadTable = async () => { const handleLoadTable = async () => {
if (selectedRows.value.length < 1) { if (selectedRows.value.length < 1) {
ElMessage.info('至少要选择一条数据') ElMessage.info($t('uiMsg.selectAtLeastOne'))
return return
} }
ElMessageBox.confirm( ElMessageBox.confirm(
`确定要删除选中的 ${selectedRows.value.length} 条数据吗?`, $t('uiMsg.deleteConfirmSelected', { n: selectedRows.value.length }),
'删除选中数据', $t('uiMsg.titleDeleteSelected'),
{ {
confirmButtonText: '确定', confirmButtonText: $t('uiMsg.btnOk'),
cancelButtonText: '取消', cancelButtonText: $t('uiMsg.btnCancel'),
type: 'error' type: 'error'
} }
).then(() => { ).then(() => {
api.deleteCrontabLog({ ids: selectedRows.value.map((row) => row.id) }).then(() => { api.deleteCrontabLog({ ids: selectedRows.value.map((row) => row.id) }).then(() => {
ElMessage.success('删除成功') ElMessage.success($t('uiMsg.deleteSuccess'))
refreshData() refreshData()
}) })
}) })

View File

@@ -2,9 +2,9 @@
DB_TYPE=mysql DB_TYPE=mysql
DB_HOST=127.0.0.1 DB_HOST=127.0.0.1
DB_PORT=3306 DB_PORT=3306
DB_NAME=saiadmin DB_NAME=dafuweng-v3
DB_USER=root DB_USER=dafuweng-v3
DB_PASSWORD=123456 DB_PASSWORD=tA6rciKLKxpFNGAm
DB_PREFIX= DB_PREFIX=
DB_POOL_MAX=32 DB_POOL_MAX=32
DB_POOL_MIN=4 DB_POOL_MIN=4
@@ -17,10 +17,15 @@ REDIS_POOL_MAX=32
REDIS_HOST=127.0.0.1 REDIS_HOST=127.0.0.1
REDIS_PORT=6379 REDIS_PORT=6379
REDIS_PASSWORD='' REDIS_PASSWORD=''
REDIS_DB=0 REDIS_DB=1
# webman channel用于定时任务通信
WEBMAN_CHANNEL_HOST=127.0.0.1
WEBMAN_CHANNEL_PORT=2207
WEBMAN_CHANNEL_LISTEN_HOST=0.0.0.0
# 游戏地址,用于 /api/v1/getGameUrl 返回 # 游戏地址,用于 /api/v1/getGameUrl 返回
GAME_URL=dice-game.yuliao666.top GAME_URL=dice-v3-game.yuliao666.top
# API 鉴权与用户(可选,不填则用默认值) # API 鉴权与用户(可选,不填则用默认值)
# authToken 签名密钥(必填,与客户端约定,用于 signature 校验) # authToken 签名密钥(必填,与客户端约定,用于 signature 校验)

View File

@@ -11,6 +11,7 @@ use app\api\logic\GameLogic;
use app\api\logic\PlayStartLogic; use app\api\logic\PlayStartLogic;
use app\api\util\ReturnCode; use app\api\util\ReturnCode;
use app\dice\model\config\DiceConfig; use app\dice\model\config\DiceConfig;
use app\dice\model\ante_config\DiceAnteConfig;
use app\dice\model\play_record\DicePlayRecord; use app\dice\model\play_record\DicePlayRecord;
use app\dice\model\player\DicePlayer; use app\dice\model\player\DicePlayer;
use app\dice\model\reward\DiceRewardConfig; use app\dice\model\reward\DiceRewardConfig;
@@ -73,30 +74,30 @@ class GameController extends BaseController
* 购买抽奖券 * 购买抽奖券
* POST /api/game/buyLotteryTickets * POST /api/game/buyLotteryTickets
* header: token由 TokenMiddleware 注入 request->player_id * header: token由 TokenMiddleware 注入 request->player_id
* body: count = 1 | 5 | 101次/100coin, 5次/500coin, 10次/1000coin * body: count = 1 | 5 | 101次/1coin, 5次/5coin, 10次/10coin
*/ */
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);
} // }
} // }
/** /**
* 获取彩金池(中奖配置表) * 获取彩金池(中奖配置表)
@@ -127,6 +128,8 @@ class GameController extends BaseController
if ($uiEn !== '') { if ($uiEn !== '') {
$row['ui_text'] = $uiEn; $row['ui_text'] = $uiEn;
} }
//移除掉其中的s_start_index和n_start_index
$row = array_diff_key($row, ['s_start_index'=>'', 's_end_index'=>'', 'weight'=>'', 'ui_text_en'=>'', 'create_time'=>'', 'update_time'=>'', 'type'=>'']);
$list[$index] = $row; $list[$index] = $row;
} }
} }
@@ -134,6 +137,20 @@ class GameController extends BaseController
return $this->success($list); return $this->success($list);
} }
/**
* 获取底注配置(全部)
* GET/any /api/game/anteConfig
* header: tokenTokenMiddleware 注入)
* 返回dice_ante_config 列表(包含 mult/is_default 等字段)
*/
public function anteConfig(Request $request): Response
{
// 用于后续抽奖校验:在接口中实例化 model后续逻辑可复用相同的数据读取方式。
$anteConfigModel = new DiceAnteConfig();
$rows = $anteConfigModel->order('id', 'asc')->select()->toArray();
return $this->success($rows);
}
/** /**
* 开始游戏(抽奖一局) * 开始游戏(抽奖一局)
* POST /api/game/playStart * POST /api/game/playStart
@@ -147,21 +164,21 @@ class GameController extends BaseController
if ($direction !== null) { if ($direction !== null) {
$direction = (int) $direction; $direction = (int) $direction;
} }
$ante = $request->post('ante');
if ($ante !== null) {
$ante = (int) $ante;
}
if (!in_array($direction, [0, 1], true)) { if (!in_array($direction, [0, 1], true)) {
return $this->fail('direction must be 0 or 1', ReturnCode::PARAMS_ERROR); return $this->fail('direction must be 0 or 1', ReturnCode::PARAMS_ERROR);
} }
if (!is_int($ante) || $ante <= 0) {
return $this->fail('ante must be a positive integer', ReturnCode::PARAMS_ERROR);
}
$player = DicePlayer::find($userId); $player = DicePlayer::find($userId);
if (!$player) { if (!$player) {
return $this->fail('User not found', ReturnCode::NOT_FOUND); return $this->fail('User not found', ReturnCode::NOT_FOUND);
} }
$minEv = DiceRewardConfig::getCachedMinRealEv();
$minCoin = abs($minEv + 100);
$coin = (float) $player->coin;
if ($coin < $minCoin) {
$msg = ApiLang::translateParams('Balance %s is less than %s, cannot continue', [$coin, $minCoin], $request);
return $this->success([], $msg);
}
$lockName = 'play_start_' . $userId; $lockName = 'play_start_' . $userId;
$lockResult = Db::query('SELECT GET_LOCK(?, 30) as l', [$lockName]); $lockResult = Db::query('SELECT GET_LOCK(?, 30) as l', [$lockName]);
@@ -170,7 +187,7 @@ class GameController extends BaseController
} }
try { try {
$logic = new PlayStartLogic(); $logic = new PlayStartLogic();
$data = $logic->run($userId, (int)$direction); $data = $logic->run($userId, (int) $direction, $ante);
$lang = $request->header('lang', 'zh'); $lang = $request->header('lang', 'zh');
if (!is_string($lang) || $lang === '') { if (!is_string($lang) || $lang === '') {
@@ -179,10 +196,11 @@ class GameController extends BaseController
$langLower = strtolower($lang); $langLower = strtolower($lang);
$isEn = $langLower === 'en' || str_starts_with($langLower, 'en-'); $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) { if ($configRow !== null) {
$uiText = ''; $uiText = '';
$uiTextEn = ''; $uiTextEn = '';
@@ -201,6 +219,7 @@ class GameController extends BaseController
} }
} }
} }
$data['tier'] = $data['reward_tier'] ?? '';
return $this->success($data); return $this->success($data);
} catch (ApiException $e) { } catch (ApiException $e) {
@@ -232,9 +251,8 @@ class GameController extends BaseController
'win_coin' => 0, 'win_coin' => 0,
'super_win_coin' => 0, 'super_win_coin' => 0,
'reward_win_coin' => 0, 'reward_win_coin' => 0,
'use_coins' => 0,
'direction' => $direction, 'direction' => $direction,
'reward_config_id' => 0, 'reward_tier' => '',
'start_index' => 0, 'start_index' => 0,
'target_index' => 0, 'target_index' => 0,
'roll_array' => '[]', 'roll_array' => '[]',

View File

@@ -91,7 +91,7 @@ class UserController extends BaseController
if (empty($user)) { if (empty($user)) {
return $this->fail('User not found', ReturnCode::NOT_FOUND); 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 = []; $info = [];
foreach ($fields as $field) { foreach ($fields as $field) {
if (array_key_exists($field, $user)) { if (array_key_exists($field, $user)) {

View File

@@ -17,9 +17,9 @@ use support\think\Db;
class GameLogic class GameLogic
{ {
public const PACKAGES = [ public const PACKAGES = [
1 => ['coin' => 100, 'paid' => 1, 'free' => 0], // 1次/100coin 1 => ['coin' => 1, 'paid' => 1, 'free' => 0], // 1次/1coin
5 => ['coin' => 500, 'paid' => 5, 'free' => 1], // 5张/500coin5购买+1赠送共6次 5 => ['coin' => 5, 'paid' => 5, 'free' => 1], // 5张/5coin5购买+1赠送共6次
10 => ['coin' => 1000, 'paid' => 10, 'free' => 3], // 10张/1000coin10购买+3赠送共13次 10 => ['coin' => 10, 'paid' => 10, 'free' => 3], // 10张/10coin10购买+3赠送共13次
]; ];
/** 钱包流水类型:购买抽奖次数 */ /** 钱包流水类型:购买抽奖次数 */
@@ -52,7 +52,7 @@ class GameLogic
throw new ApiException('Insufficient balance'); throw new ApiException('Insufficient balance');
} }
$coinAfter = $coinBefore - $cost; $coinAfter = round($coinBefore - $cost, 2);
$totalBefore = (int) ($player->total_ticket_count ?? 0); $totalBefore = (int) ($player->total_ticket_count ?? 0);
$paidBefore = (int) ($player->paid_ticket_count ?? 0); $paidBefore = (int) ($player->paid_ticket_count ?? 0);
$freeBefore = (int) ($player->free_ticket_count ?? 0); $freeBefore = (int) ($player->free_ticket_count ?? 0);
@@ -94,7 +94,7 @@ class GameLogic
DicePlayerWalletRecord::create([ DicePlayerWalletRecord::create([
'player_id' => $playerId, 'player_id' => $playerId,
'admin_id' => $adminId, 'admin_id' => $adminId,
'coin' => -$cost, 'coin' => round(-$cost, 2),
'type' => self::WALLET_TYPE_BUY_DRAW, 'type' => self::WALLET_TYPE_BUY_DRAW,
'wallet_before' => $coinBefore, 'wallet_before' => $coinBefore,
'wallet_after' => $coinAfter, 'wallet_after' => $coinAfter,
@@ -107,7 +107,8 @@ class GameLogic
DicePlayerTicketRecord::create([ DicePlayerTicketRecord::create([
'player_id' => $playerId, 'player_id' => $playerId,
'admin_id' => $adminId, 'admin_id' => $adminId,
'use_coins' => $cost, 'use_coins' => round($cost, 2),
'ante' => 1,
'total_ticket_count' => $addTotal, 'total_ticket_count' => $addTotal,
'paid_ticket_count' => $addPaid, 'paid_ticket_count' => $addPaid,
'free_ticket_count' => $addFree, 'free_ticket_count' => $addFree,
@@ -120,7 +121,7 @@ class GameLogic
} }
return [ return [
'coin' => (float) $coinAfter, 'coin' => round((float) $coinAfter, 2),
'total_ticket_count' => (int) $totalAfter, 'total_ticket_count' => (int) $totalAfter,
'paid_ticket_count' => (int) $paidAfter, 'paid_ticket_count' => (int) $paidAfter,
'free_ticket_count' => (int) $freeAfter, 'free_ticket_count' => (int) $freeAfter,

View File

@@ -8,6 +8,7 @@ use app\api\util\ApiLang;
use app\api\service\LotteryService; use app\api\service\LotteryService;
use app\dice\model\lottery_pool_config\DiceLotteryPoolConfig; use app\dice\model\lottery_pool_config\DiceLotteryPoolConfig;
use app\dice\model\play_record\DicePlayRecord; use app\dice\model\play_record\DicePlayRecord;
use app\dice\model\ante_config\DiceAnteConfig;
use app\dice\model\player\DicePlayer; use app\dice\model\player\DicePlayer;
use app\dice\model\player_ticket_record\DicePlayerTicketRecord; use app\dice\model\player_ticket_record\DicePlayerTicketRecord;
use app\dice\model\player_wallet_record\DicePlayerWalletRecord; use app\dice\model\player_wallet_record\DicePlayerWalletRecord;
@@ -23,6 +24,8 @@ use support\think\Db;
*/ */
class PlayStartLogic class PlayStartLogic
{ {
/** 钱包流水类型:购买抽奖次数 */
public const WALLET_TYPE_BUY_DRAW = 2;
/** 抽奖类型:付费 */ /** 抽奖类型:付费 */
public const LOTTERY_TYPE_PAID = 0; public const LOTTERY_TYPE_PAID = 0;
/** 抽奖类型:免费 */ /** 抽奖类型:免费 */
@@ -34,8 +37,12 @@ class PlayStartLogic
/** 对局状态:超时/失败 */ /** 对局状态:超时/失败 */
public const RECORD_STATUS_TIMEOUT = 0; public const RECORD_STATUS_TIMEOUT = 0;
/** 开启对局最低余额 = |DiceRewardConfig 最小 real_ev + 100| */ /** 单注费用(抽奖券基础费用) */
private const MIN_COIN_EXTRA = 100; private const UNIT_COST = 1.0;
/** 免费抽奖注数缓存 key 前缀(用于强制下一局注数一致) */
private const FREE_ANTE_KEY_PREFIX = 'api:game:free_ante:';
/** 免费抽奖注数缓存过期(秒) */
private const FREE_ANTE_TTL = 86400 * 7;
/** 豹子号中大奖额外平台币(无 BIGWIN 配置时兜底) */ /** 豹子号中大奖额外平台币(无 BIGWIN 配置时兜底) */
private const SUPER_WIN_BONUS = 500; private const SUPER_WIN_BONUS = 500;
/** 可触发超级大奖的 grid_number5=全1 10=全2 15=全3 20=全4 25=全5 30=全6 */ /** 可触发超级大奖的 grid_number5=全1 10=全2 15=全3 20=全4 25=全5 30=全6 */
@@ -47,36 +54,80 @@ class PlayStartLogic
* 执行一局游戏 * 执行一局游戏
* @param int $playerId 玩家ID * @param int $playerId 玩家ID
* @param int $direction 方向 0=无/顺时针 1=中奖/逆时针(前端 direction * @param int $direction 方向 0=无/顺时针 1=中奖/逆时针(前端 direction
* @param int $ante 注数(必须在 DiceAnteConfig.mult 中存在)
* @return array 成功返回 DicePlayRecord 数据;余额不足时抛 ApiExceptionmessage 为约定文案 * @return array 成功返回 DicePlayRecord 数据;余额不足时抛 ApiExceptionmessage 为约定文案
*/ */
public function run(int $playerId, int $direction): array public function run(int $playerId, int $direction, int $ante): array
{ {
$player = DicePlayer::find($playerId); $player = DicePlayer::find($playerId);
if (!$player) { if (!$player) {
throw new ApiException('User not found'); throw new ApiException('User not found');
} }
$minEv = DiceRewardConfig::getCachedMinRealEv();
$minCoin = abs($minEv + self::MIN_COIN_EXTRA);
$coin = (float) $player->coin; $coin = (float) $player->coin;
if ($coin < $minCoin) { if ($ante <= 0) {
throw new ApiException(ApiLang::translateParams('当前玩家余额%s小于%s无法继续游戏', [$coin, $minCoin])); throw new ApiException('ante must be a positive integer');
} }
$paid = (int) ($player->paid_ticket_count ?? 0); // 注数合规校验ante 必须存在于 dice_ante_config.mult
$free = (int) ($player->free_ticket_count ?? 0); $anteConfigModel = new DiceAnteConfig();
if ($paid + $free <= 0) { $exists = $anteConfigModel->where('mult', $ante)->count();
throw new ApiException('Insufficient lottery tickets'); if ($exists <= 0) {
throw new ApiException('当前注数不合规,请选择正确的注数');
}
// 免费抽奖:优先使用 free_ticket带 ante 与 count兼容旧字段 free_ticket_count
$freeTicket = $player->free_ticket ?? null;
$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) {
throw new ApiException('免费抽奖注数必须与上一次一致,请修改注数后继续');
}
} }
$lotteryService = LotteryService::getOrCreate($playerId);
$ticketType = LotteryService::drawTicketType($paid, $free);
$configType0 = DiceLotteryPoolConfig::where('name', 'default')->find(); $configType0 = DiceLotteryPoolConfig::where('name', 'default')->find();
$configType1 = DiceLotteryPoolConfig::where('name', 'killScore')->find(); $configType1 = DiceLotteryPoolConfig::where('name', 'killScore')->find();
if (!$configType0) { if (!$configType0) {
throw new ApiException('Lottery pool config not found (name=default required)'); throw new ApiException('Lottery pool config not found (name=default required)');
} }
// 余额校验:统一校验 ante * min(real_ev)
$minEv = DiceRewardConfig::getCachedMinRealEv();
$needMinBalance = abs((float) $minEv) * $ante;
if ($coin < $needMinBalance) {
throw new ApiException('未达抽奖余额 ' . $needMinBalance . ',无法开始游戏');
}
// 付费抽奖:开始前扣除费用 ante * UNIT_COST不足则提示余额不足
$paidAmount = $ticketType === self::LOTTERY_TYPE_PAID ? round($ante * self::UNIT_COST, 2) : 0.0;
if ($ticketType === self::LOTTERY_TYPE_PAID && $coin < $paidAmount) {
throw new ApiException('余额不足');
}
// 彩金池累计盈利:用于判断是否触发杀分(不再依赖单个玩家累计盈利) // 彩金池累计盈利:用于判断是否触发杀分(不再依赖单个玩家累计盈利)
// 该值来自 dice_lottery_pool_config.profit_amount // 该值来自 dice_lottery_pool_config.profit_amount
$poolProfitTotal = $configType0->profit_amount ?? 0; $poolProfitTotal = $configType0->profit_amount ?? 0;
@@ -132,12 +183,17 @@ class PlayStartLogic
$targetIndex = (int) ($chosen['end_index'] ?? 0); $targetIndex = (int) ($chosen['end_index'] ?? 0);
$rollNumber = (int) ($chosen['grid_number'] ?? 0); $rollNumber = (int) ($chosen['grid_number'] ?? 0);
$realEv = (float) ($chosen['real_ev'] ?? 0); $realEv = (float) ($chosen['real_ev'] ?? 0);
// T5/再来一次:以奖励行 tier 为准,并以摇奖档位 $tier 兜底(与 reward_tier 展示一致,避免 dice_reward 行缺 tier 时不发券)
$isTierT5 = (string) ($chosen['tier'] ?? '') === 'T5'; $isTierT5 = (string) ($chosen['tier'] ?? '') === 'T5';
$rewardWinCoin = $isTierT5 ? $realEv : (100 + $realEv); if ($isTierT5 === false && (string) ($tier ?? '') === 'T5') {
$isTierT5 = true;
}
// 摇色子中奖:按 dice_reward_config.real_ev 直接结算(已乘 ante
$rewardWinCoin = round($realEv * $ante, 2);
// 豹子判定5/30 必豹子10/15/20/25 按 DiceRewardConfig 中 BIGWIN 该点数的 weight 判定0-1000010000=100% // 豹子判定5/30 必豹子10/15/20/25 按 DiceRewardConfig 中 BIGWIN 该点数的 weight 判定0-1000010000=100%
// 杀分档位不触发豹子5/30 已在上方抽取时排除10/15/20/25 仅生成非豹子组合 // 杀分档位不触发豹子5/30 已在上方抽取时排除10/15/20/25 仅生成非豹子组合
$superWinCoin = 0; $superWinCoin = 0.0;
$isWin = 0; $isWin = 0;
$bigWinRealEv = 0.0; $bigWinRealEv = 0.0;
if (in_array($rollNumber, self::SUPER_WIN_GRID_NUMBERS, true)) { if (in_array($rollNumber, self::SUPER_WIN_GRID_NUMBERS, true)) {
@@ -166,10 +222,11 @@ class PlayStartLogic
if ($doSuperWin) { if ($doSuperWin) {
$rollArray = $this->getSuperWinRollArray($rollNumber); $rollArray = $this->getSuperWinRollArray($rollNumber);
$isWin = 1; $isWin = 1;
$superWinCoin = $bigWinRealEv > 0 ? $bigWinRealEv : self::SUPER_WIN_BONUS; $bigWinEv = $bigWinRealEv > 0 ? $bigWinRealEv : self::SUPER_WIN_BONUS;
$superWinCoin = round($bigWinEv * $ante, 2);
// 中 BIGWIN 豹子:不走原奖励流程,不记录原奖励,不触发 T5 再来一次,仅发放豹子奖金 // 中 BIGWIN 豹子:不走原奖励流程,不记录原奖励,不触发 T5 再来一次,仅发放豹子奖金
$rewardWinCoin = 0; $rewardWinCoin = 0.0;
$realEv = 0; $realEv = 0.0;
$isTierT5 = false; $isTierT5 = false;
} else { } else {
$rollArray = $this->generateNonSuperWinRollArrayWithSum($rollNumber); $rollArray = $this->generateNonSuperWinRollArrayWithSum($rollNumber);
@@ -186,7 +243,7 @@ class PlayStartLogic
$startIndex, $startIndex,
$targetIndex $targetIndex
)); ));
$winCoin = $superWinCoin + $rewardWinCoin; // 赢取平台币 = 中大奖 + 摇色子中奖(豹子时 rewardWinCoin 已为 0 $winCoin = round($superWinCoin + $rewardWinCoin, 2); // 赢取平台币 = 中大奖 + 摇色子中奖(豹子时 rewardWinCoin 已为 0
$record = null; $record = null;
$configId = (int) $config->id; $configId = (int) $config->id;
@@ -200,9 +257,10 @@ class PlayStartLogic
$adminId, $adminId,
$configId, $configId,
$type0ConfigId, $type0ConfigId,
$rewardId,
$configName, $configName,
$ticketType, $ticketType,
$ante,
$paidAmount,
$winCoin, $winCoin,
$superWinCoin, $superWinCoin,
$rewardWinCoin, $rewardWinCoin,
@@ -214,25 +272,27 @@ class PlayStartLogic
$targetIndex, $targetIndex,
$rollArray, $rollArray,
$isTierT5, $isTierT5,
$tier,
&$record &$record
) { ) {
$rewardTier = ($isWin === 1 && $superWinCoin > 0) ? 'BIGWIN' : (string) ($tier ?? '');
$record = DicePlayRecord::create([ $record = DicePlayRecord::create([
'player_id' => $playerId, 'player_id' => $playerId,
'admin_id' => $adminId, 'admin_id' => $adminId,
'lottery_config_id' => $configId, 'lottery_config_id' => $configId,
'lottery_type' => $ticketType, 'lottery_type' => $ticketType,
'ante' => $ante,
'paid_amount' => $paidAmount,
'is_win' => $isWin, 'is_win' => $isWin,
'win_coin' => $winCoin, 'win_coin' => $winCoin,
'super_win_coin' => $superWinCoin, 'super_win_coin' => $superWinCoin,
'reward_win_coin' => $rewardWinCoin, 'reward_win_coin' => $rewardWinCoin,
'use_coins' => 0,
'direction' => $direction, 'direction' => $direction,
'reward_config_id' => $rewardId, 'reward_tier' => $rewardTier,
'start_index' => $startIndex, 'start_index' => $startIndex,
'target_index' => $targetIndex, 'target_index' => $targetIndex,
'roll_array' => is_array($rollArray) ? json_encode($rollArray) : $rollArray, 'roll_array' => is_array($rollArray) ? json_encode($rollArray) : $rollArray,
'roll_number' => is_array($rollArray) ? array_sum($rollArray) : 0, 'roll_number' => is_array($rollArray) ? array_sum($rollArray) : 0,
'lottery_name' => $configName,
'status' => self::RECORD_STATUS_SUCCESS, 'status' => self::RECORD_STATUS_SUCCESS,
]); ]);
@@ -241,38 +301,112 @@ class PlayStartLogic
throw new \RuntimeException('玩家不存在'); throw new \RuntimeException('玩家不存在');
} }
$coinBefore = (float) $p->coin; $coinBefore = (float) $p->coin;
$coinAfter = $coinBefore + $winCoin; // 开始前先扣付费金额,再加中奖金额(免费抽奖 paid_amount=0
$coinAfter = round($coinBefore - $paidAmount + $winCoin, 2);
$p->coin = $coinAfter; $p->coin = $coinAfter;
$p->total_ticket_count = max(0, (int) $p->total_ticket_count - 1); // 免费抽奖消耗:优先消耗 free_ticket.count,耗尽则清空 free_ticket否则兼容旧 free_ticket_count
if ($ticketType === self::LOTTERY_TYPE_PAID) { if ($ticketType === self::LOTTERY_TYPE_FREE) {
$p->paid_ticket_count = max(0, (int) $p->paid_ticket_count - 1); $ft = $p->free_ticket ?? null;
} else { $ftAnte = null;
$p->free_ticket_count = max(0, (int) $p->free_ticket_count - 1); $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);
}
} }
// 若本局中奖档位为 T5则额外赠送 1 次免费抽奖次数(总次数也 +1并记录抽奖券获取记录 // 记录每次游玩:写入抽奖券记录(用于后台“抽奖券记录”追踪付费/免费游玩与消耗)
$isPaidPlay = $ticketType === self::LOTTERY_TYPE_PAID;
$paidCnt = $isPaidPlay ? 1 : 0;
$freeCnt = $isPaidPlay ? 0 : 1;
DicePlayerTicketRecord::create([
'player_id' => $playerId,
'admin_id' => $adminId,
'use_coins' => $paidAmount,
'ante' => $ante,
'total_ticket_count' => $paidCnt + $freeCnt,
'paid_ticket_count' => $paidCnt,
'free_ticket_count' => $freeCnt,
'remark' => ($isPaidPlay ? '付费游玩' : '免费游玩') . '|play_record_id=' . $record->id,
]);
// 若本局中奖档位为 T5则额外赠送 1 次免费抽奖次数:
// - 新结构:写入 free_ticketante=本局注数count+1
// - 兼容旧结构free_ticket_count +1
if ($isTierT5) { if ($isTierT5) {
$p->free_ticket_count = (int) $p->free_ticket_count + 1; $ft = $p->free_ticket ?? null;
$p->total_ticket_count = (int) $p->total_ticket_count + 1; $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([ DicePlayerTicketRecord::create([
'player_id' => $playerId, 'player_id' => $playerId,
'admin_id' => $adminId, 'admin_id' => $adminId,
'ante' => $ante,
'free_ticket_count' => 1, 'free_ticket_count' => 1,
'remark' => '中奖结果为T5', 'remark' => '中奖结果为T5',
]); ]);
// 记录免费抽奖注数,用于强制下一局注数一致
Cache::set(self::FREE_ANTE_KEY_PREFIX . $playerId, $ante, self::FREE_ANTE_TTL);
} else {
// 若本次消耗了最后一次免费抽奖,则清理注数锁
$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);
}
} }
$p->save(); $p->save();
// 彩金池累计盈利累加在 name=default 彩金池上: // 彩金池累计盈利累加在 name=default 彩金池上:
// 付费:每局按“当前中奖金额(含 BIGWIN - 抽奖费用 100” // 付费:每局按「本局赢取平台币 win_coin - 抽奖费用 paid_amountante*UNIT_COST
// 免费券:取消票价成本 100只计入中奖金额 // 免费券:paid_amount=0只计入 win_coin
$perPlayProfit = ($ticketType === self::LOTTERY_TYPE_PAID) ? ($winCoin - 100.0) : $winCoin; $perPlayProfit = ($ticketType === self::LOTTERY_TYPE_PAID) ? ($winCoin - $paidAmount) : $winCoin;
$addProfit = $perPlayProfit; $addProfit = round($perPlayProfit, 2);
try { try {
DiceLotteryPoolConfig::where('id', $type0ConfigId)->update([ DiceLotteryPoolConfig::where('id', $type0ConfigId)->update([
'profit_amount' => Db::raw('IFNULL(profit_amount,0) + ' . (float) $addProfit), 'profit_amount' => Db::raw('IFNULL(profit_amount,0) + ' . sprintf('%.2f', $addProfit)),
]); ]);
} catch (\Throwable $e) { } catch (\Throwable $e) {
Log::warning('彩金池盈利累加失败', [ Log::warning('彩金池盈利累加失败', [
@@ -282,14 +416,30 @@ class PlayStartLogic
]); ]);
} }
// 钱包流水拆分:先记录购券扣费,再记录抽奖结果(中奖/惩罚)
if ($paidAmount > 0) {
$walletAfterBuy = round($coinBefore - $paidAmount, 2);
DicePlayerWalletRecord::create([
'player_id' => $playerId,
'admin_id' => $adminId,
'coin' => round(-$paidAmount, 2),
'type' => self::WALLET_TYPE_BUY_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([ DicePlayerWalletRecord::create([
'player_id' => $playerId, 'player_id' => $playerId,
'admin_id' => $adminId, 'admin_id' => $adminId,
'coin' => $winCoin, 'coin' => $winCoin,
'type' => self::WALLET_TYPE_DRAW, 'type' => self::WALLET_TYPE_DRAW,
'wallet_before' => $coinBefore, 'wallet_before' => round($walletBeforeDraw, 2),
'wallet_after' => $coinAfter, 'wallet_after' => $coinAfter,
'remark' => '抽奖|play_record_id=' . $record->id, 'remark' => $drawRemark,
]); ]);
}); });
} catch (\Throwable $e) { } catch (\Throwable $e) {
@@ -304,9 +454,8 @@ class PlayStartLogic
'win_coin' => 0, 'win_coin' => 0,
'super_win_coin' => 0, 'super_win_coin' => 0,
'reward_win_coin' => 0, 'reward_win_coin' => 0,
'use_coins' => 0,
'direction' => $direction, 'direction' => $direction,
'reward_config_id' => 0, 'reward_tier' => '',
'start_index' => $startIndex, 'start_index' => $startIndex,
'target_index' => 0, 'target_index' => 0,
'roll_array' => '[]', 'roll_array' => '[]',
@@ -333,10 +482,11 @@ class PlayStartLogic
$arr['roll_array'] = json_decode($arr['roll_array'], true) ?? []; $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['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; $arr['coin'] = $updated ? round((float) $updated->coin, 2) : 0.0;
$arr['total_ticket_count'] = $updated ? (int) $updated->total_ticket_count : 0; // 本局从玩家货币中扣除的金额:付费抽奖为 ante*UNIT_COST免费抽奖为 0与 paid_amount 一致)
$arr['use_coin'] = round($paidAmount, 2);
return $arr; return $arr;
} }
@@ -468,10 +618,11 @@ class PlayStartLogic
* @param \app\dice\model\lottery_pool_config\DiceLotteryPoolConfig|null $config 奖池配置,自定义档位时可为 null * @param \app\dice\model\lottery_pool_config\DiceLotteryPoolConfig|null $config 奖池配置,自定义档位时可为 null
* @param int $direction 0=顺时针 1=逆时针 * @param int $direction 0=顺时针 1=逆时针
* @param int $lotteryType 0=付费 1=免费 * @param int $lotteryType 0=付费 1=免费
* @param int $ante 底注/注数dice_ante_config.mult
* @param array|null $customTierWeights 自定义档位权重 ['T1'=>x, 'T2'=>x, ...],非空时忽略 config 的档位权重 * @param array|null $customTierWeights 自定义档位权重 ['T1'=>x, 'T2'=>x, ...],非空时忽略 config 的档位权重
* @return array 可直接用于 DicePlayRecordTest::create 的字段 + tier用于统计档位概率 * @return array 可直接用于 DicePlayRecordTest::create 的字段 + tier用于统计档位概率
*/ */
public function simulateOnePlay($config, int $direction, int $lotteryType = 0, ?array $customTierWeights = null): array public function simulateOnePlay($config, int $direction, int $lotteryType = 0, int $ante = 1, ?array $customTierWeights = null): array
{ {
$rewardInstance = DiceReward::getCachedInstance(); $rewardInstance = DiceReward::getCachedInstance();
$byTierDirection = $rewardInstance['by_tier_direction'] ?? []; $byTierDirection = $rewardInstance['by_tier_direction'] ?? [];
@@ -517,10 +668,10 @@ class PlayStartLogic
$targetIndex = (int) ($chosen['end_index'] ?? 0); $targetIndex = (int) ($chosen['end_index'] ?? 0);
$rollNumber = (int) ($chosen['grid_number'] ?? 0); $rollNumber = (int) ($chosen['grid_number'] ?? 0);
$realEv = (float) ($chosen['real_ev'] ?? 0); $realEv = (float) ($chosen['real_ev'] ?? 0);
$isTierT5 = (string) ($chosen['tier'] ?? '') === 'T5'; // 摇色子中奖:按 real_ev 直接结算(与正式抽奖 run() 一致)
$rewardWinCoin = $isTierT5 ? $realEv : (100 + $realEv); $rewardWinCoin = round($realEv * $ante, 2);
$superWinCoin = 0; $superWinCoin = 0.0;
$isWin = 0; $isWin = 0;
$bigWinRealEv = 0.0; $bigWinRealEv = 0.0;
if (in_array($rollNumber, self::SUPER_WIN_GRID_NUMBERS, true)) { if (in_array($rollNumber, self::SUPER_WIN_GRID_NUMBERS, true)) {
@@ -547,8 +698,11 @@ class PlayStartLogic
if ($doSuperWin) { if ($doSuperWin) {
$rollArray = $this->getSuperWinRollArray($rollNumber); $rollArray = $this->getSuperWinRollArray($rollNumber);
$isWin = 1; $isWin = 1;
$superWinCoin = $bigWinRealEv > 0 ? $bigWinRealEv : self::SUPER_WIN_BONUS; $bigWinEv = $bigWinRealEv > 0 ? $bigWinRealEv : self::SUPER_WIN_BONUS;
$rewardWinCoin = 0; $superWinCoin = round($bigWinEv * $ante, 2);
$rewardWinCoin = 0.0;
// 中豹子时不走原奖励流程
$realEv = 0.0;
} else { } else {
$rollArray = $this->generateNonSuperWinRollArrayWithSum($rollNumber); $rollArray = $this->generateNonSuperWinRollArrayWithSum($rollNumber);
} }
@@ -557,11 +711,14 @@ class PlayStartLogic
$rollArray = $this->generateRollArrayFromSum($rollNumber); $rollArray = $this->generateRollArrayFromSum($rollNumber);
} }
$winCoin = $superWinCoin + $rewardWinCoin; $winCoin = round($superWinCoin + $rewardWinCoin, 2);
$configId = $config !== null ? (int) $config->id : 0; $configId = $config !== null ? (int) $config->id : 0;
$rewardId = ($isWin === 1 && $superWinCoin > 0) ? 0 : $targetIndex;
$configName = $config !== null ? (string) ($config->name ?? '') : '自定义'; $configName = $config !== null ? (string) ($config->name ?? '') : '自定义';
$costRealEv = $realEv + ($isWin === 1 ? $bigWinRealEv : 0.0); $costRealEv = $realEv + ($isWin === 1 ? $bigWinRealEv : 0.0);
$paidAmount = $lotteryType === 0 ? round($ante * self::UNIT_COST, 2) : 0.0;
$rewardTier = ($isWin === 1 && $superWinCoin > 0) ? 'BIGWIN' : (string) ($tier ?? '');
// 与写入记录的 reward_tier 完全一致:仅当展示档位为 T5非豹子大奖时触发「再来一次」链式免费局
$grantsFreeTicket = ($rewardTier === 'T5');
return [ return [
'player_id' => 0, 'player_id' => 0,
@@ -570,22 +727,23 @@ class PlayStartLogic
'lottery_type' => $lotteryType, 'lottery_type' => $lotteryType,
'is_win' => $isWin, 'is_win' => $isWin,
'win_coin' => $winCoin, 'win_coin' => $winCoin,
'ante' => $ante,
'paid_amount' => $paidAmount,
'super_win_coin' => $superWinCoin, 'super_win_coin' => $superWinCoin,
'reward_win_coin' => $rewardWinCoin, 'reward_win_coin' => $rewardWinCoin,
'use_coins' => 0,
'direction' => $direction, 'direction' => $direction,
'reward_config_id' => $rewardId, 'reward_tier' => $rewardTier,
'start_index' => $startIndex, 'start_index' => $startIndex,
'target_index' => $targetIndex, 'target_index' => $targetIndex,
'roll_array' => json_encode($rollArray), 'roll_array' => json_encode($rollArray),
'roll_number' => array_sum($rollArray), 'roll_number' => array_sum($rollArray),
'lottery_name' => $configName,
'status' => self::RECORD_STATUS_SUCCESS, 'status' => self::RECORD_STATUS_SUCCESS,
'tier' => $tier, 'tier' => $tier,
'roll_number_for_count' => $rollNumber, 'roll_number_for_count' => $rollNumber,
'real_ev' => $realEv, 'real_ev' => $realEv,
'bigwin_real_ev' => $isWin === 1 ? $bigWinRealEv : 0.0, 'bigwin_real_ev' => $isWin === 1 ? $bigWinRealEv : 0.0,
'cost_ev' => $costRealEv, 'cost_ev' => $costRealEv,
'grants_free_ticket' => $grantsFreeTicket,
]; ];
} }
} }

View File

@@ -0,0 +1,78 @@
<?php
// +----------------------------------------------------------------------
// | saiadmin [ saiadmin快速开发框架 ]
// +----------------------------------------------------------------------
// | Author: your name
// +----------------------------------------------------------------------
namespace app\dice\controller\ante_config;
use app\dice\logic\ante_config\DiceAnteConfigLogic;
use app\dice\validate\ante_config\DiceAnteConfigValidate;
use plugin\saiadmin\basic\BaseController;
use plugin\saiadmin\service\Permission;
use support\Request;
use support\Response;
/**
* 底注配置控制器
*/
class DiceAnteConfigController extends BaseController
{
public function __construct()
{
$this->logic = new DiceAnteConfigLogic();
$this->validate = new DiceAnteConfigValidate();
parent::__construct();
}
#[Permission('底注配置列表', 'dice:ante_config:index:index')]
public function index(Request $request): Response
{
$where = $request->more([
['name', ''],
['title', ''],
['is_default', ''],
]);
$query = $this->logic->search($where);
$data = $this->logic->getList($query);
return $this->success($data);
}
#[Permission('底注配置读取', 'dice:ante_config:index:read')]
public function read(Request $request): Response
{
$id = $request->input('id', '');
$model = $this->logic->read($id);
$data = is_array($model) ? $model : $model->toArray();
return $this->success($data);
}
#[Permission('底注配置添加', 'dice:ante_config:index:save')]
public function save(Request $request): Response
{
$data = $request->post();
$this->validate('save', $data);
$result = $this->logic->add($data);
return $result ? $this->success('add success') : $this->fail('add failed');
}
#[Permission('底注配置修改', 'dice:ante_config:index:update')]
public function update(Request $request): Response
{
$data = $request->post();
$this->validate('update', $data);
$result = $this->logic->edit($data['id'], $data);
return $result ? $this->success('update success') : $this->fail('update failed');
}
#[Permission('底注配置删除', 'dice:ante_config:index:destroy')]
public function destroy(Request $request): Response
{
$ids = $request->post('ids', '');
if (empty($ids)) {
return $this->fail('please select data to delete');
}
$result = $this->logic->destroy($ids);
return $result ? $this->success('delete success') : $this->fail('delete failed');
}
}

View File

@@ -12,7 +12,6 @@ use app\dice\logic\play_record\DicePlayRecordLogic;
use app\dice\validate\play_record\DicePlayRecordValidate; use app\dice\validate\play_record\DicePlayRecordValidate;
use app\dice\model\player\DicePlayer; use app\dice\model\player\DicePlayer;
use app\dice\model\lottery_pool_config\DiceLotteryPoolConfig; use app\dice\model\lottery_pool_config\DiceLotteryPoolConfig;
use app\dice\model\reward\DiceRewardConfig;
use plugin\saiadmin\service\Permission; use plugin\saiadmin\service\Permission;
use support\Request; use support\Request;
use support\Response; use support\Response;
@@ -57,16 +56,15 @@ class DicePlayRecordController extends BaseController
AdminScopeHelper::applyAdminScope($query, $this->adminInfo ?? null); AdminScopeHelper::applyAdminScope($query, $this->adminInfo ?? null);
$query->with([ $query->with([
'dicePlayer', 'dicePlayer',
'diceRewardConfig',
'diceLotteryPoolConfig', 'diceLotteryPoolConfig',
]); ]);
// 按当前筛选条件统计:平台总盈利 = 付费抽奖(lottery_type=0)次数×100 - 玩家总收益(win_coin 求和) // 按当前筛选条件统计:平台总盈利 = 付费金额(paid_amount 求和) - 玩家总收益(win_coin 求和)
$sumQuery = clone $query; $sumQuery = clone $query;
$playerTotalWin = (float) $sumQuery->sum('win_coin'); $playerTotalWin = (float) $sumQuery->sum('win_coin');
$paidCountQuery = clone $query; $paidAmountQuery = clone $query;
$paidCount = (int) $paidCountQuery->where('lottery_type', 0)->count(); $paidAmount = (float) $paidAmountQuery->where('lottery_type', 0)->sum('paid_amount');
$totalWinCoin = $paidCount * 100 - $playerTotalWin; $totalWinCoin = round($paidAmount - $playerTotalWin, 2);
$data = $this->logic->getList($query); $data = $this->logic->getList($query);
$data['total_win_coin'] = $totalWinCoin; $data['total_win_coin'] = $totalWinCoin;
@@ -101,23 +99,6 @@ class DicePlayRecordController extends BaseController
return $this->success($data); 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 * @param Request $request

View File

@@ -30,7 +30,7 @@ class DicePlayRecordTestController extends BaseController
} }
/** /**
* 数据列表,并在结果中附带当前筛选条件下测试数据的平台总盈利 total_win_coin付费抽奖次数×100 - 玩家总收益) * 数据列表,并在结果中附带当前筛选条件下测试数据的平台总盈利 total_win_coin付费金额 paid_amount 求和 - 玩家总收益)
* @param Request $request * @param Request $request
* @return Response * @return Response
*/ */
@@ -38,23 +38,26 @@ class DicePlayRecordTestController extends BaseController
public function index(Request $request): Response public function index(Request $request): Response
{ {
$where = $request->more([ $where = $request->more([
['reward_config_record_id', ''],
['lottery_type', ''], ['lottery_type', ''],
['direction', ''], ['direction', ''],
['is_win', ''], ['is_win', ''],
['win_coin_min', ''], ['win_coin_min', ''],
['win_coin_max', ''], ['win_coin_max', ''],
['paid_amount', ''],
['ante', ''],
['reward_tier', ''], ['reward_tier', ''],
['roll_number', ''], ['roll_number', ''],
]); ]);
$query = $this->logic->search($where); $query = $this->logic->search($where);
$query->with(['diceLotteryPoolConfig', 'diceRewardConfig']); $query->with(['diceLotteryPoolConfig']);
// 按当前筛选条件统计:平台总盈利 = 付费抽奖(lottery_type=0)次数×100 - 玩家总收益(win_coin 求和) // 按当前筛选条件统计:平台总盈利 = 付费金额(paid_amount 求和) - 玩家总收益(win_coin 求和)
$sumQuery = clone $query; $sumQuery = clone $query;
$playerTotalWin = (float) $sumQuery->sum('win_coin'); $playerTotalWin = (float) $sumQuery->sum('win_coin');
$paidCountQuery = clone $query; $paidAmountQuery = clone $query;
$paidCount = (int) $paidCountQuery->where('lottery_type', 0)->count(); $paidAmount = (float) $paidAmountQuery->where('lottery_type', 0)->sum('paid_amount');
$totalWinCoin = $paidCount * 100 - $playerTotalWin; $totalWinCoin = round($paidAmount - $playerTotalWin, 2);
$data = $this->logic->getList($query); $data = $this->logic->getList($query);
$data['total_win_coin'] = $totalWinCoin; $data['total_win_coin'] = $totalWinCoin;

View File

@@ -42,6 +42,7 @@ class DicePlayerTicketRecordController extends BaseController
['username', ''], ['username', ''],
['use_coins_min', ''], ['use_coins_min', ''],
['use_coins_max', ''], ['use_coins_max', ''],
['ante', ''],
['total_ticket_count_min', ''], ['total_ticket_count_min', ''],
['total_ticket_count_max', ''], ['total_ticket_count_max', ''],
['paid_ticket_count_min', ''], ['paid_ticket_count_min', ''],

View File

@@ -81,26 +81,28 @@ class DiceRewardController extends BaseController
} }
/** /**
* 一键测试权重:创建测试记录并启动单进程后台执行,按付费/免费、顺逆方向交替写入 dice_play_record_test * 一键测试权重:创建测试记录并启动单进程后台执行,写入 dice_play_record_test
* 参数lottery_config_id 可选,不选则传 paid_tier_weights / free_tier_weights 自定义档位; * 参数lottery_config_id 可选paid_tier_weights / free_tier_weights 自定义档位;
* paid_s_count, paid_n_count, free_s_count, free_n_count或兼容旧版 s_count, n_count * paid_s_count, paid_n_count
* chain_free_mode=1仅按付费次数模拟付费抽到再来一次/T5 则在队列中插入免费局同底注、lottery_type=免费、paid_amount=0
* kill_mode_enabled=1测试内启用杀分当模拟玩家累计盈利达到 test_safety_line 后,付费抽奖切到 killScore
*/ */
#[Permission('一键测试权重', 'dice:reward:index:startWeightTest')] #[Permission('一键测试权重', 'dice:reward:index:startWeightTest')]
public function startWeightTest(Request $request): Response public function startWeightTest(Request $request): Response
{ {
$post = is_array($request->post()) ? $request->post() : []; $post = is_array($request->post()) ? $request->post() : [];
$params = [ $params = [
'ante' => $post['ante'] ?? null,
'lottery_config_id' => $post['lottery_config_id'] ?? null, 'lottery_config_id' => $post['lottery_config_id'] ?? null,
'paid_lottery_config_id' => $post['paid_lottery_config_id'] ?? null, 'paid_lottery_config_id' => $post['paid_lottery_config_id'] ?? null,
'free_lottery_config_id' => $post['free_lottery_config_id'] ?? null, 'free_lottery_config_id' => $post['free_lottery_config_id'] ?? null,
's_count' => $post['s_count'] ?? null,
'n_count' => $post['n_count'] ?? null,
'paid_s_count' => $post['paid_s_count'] ?? null, 'paid_s_count' => $post['paid_s_count'] ?? null,
'paid_n_count' => $post['paid_n_count'] ?? null, 'paid_n_count' => $post['paid_n_count'] ?? null,
'free_s_count' => $post['free_s_count'] ?? null,
'free_n_count' => $post['free_n_count'] ?? null,
'paid_tier_weights' => $post['paid_tier_weights'] ?? null, 'paid_tier_weights' => $post['paid_tier_weights'] ?? null,
'free_tier_weights' => $post['free_tier_weights'] ?? null, 'free_tier_weights' => $post['free_tier_weights'] ?? null,
'chain_free_mode' => $post['chain_free_mode'] ?? null,
'kill_mode_enabled' => $post['kill_mode_enabled'] ?? null,
'test_safety_line' => $post['test_safety_line'] ?? null,
]; ];
$adminId = isset($this->adminInfo['id']) ? (int) $this->adminInfo['id'] : null; $adminId = isset($this->adminInfo['id']) ? (int) $this->adminInfo['id'] : null;
try { try {

View File

@@ -38,6 +38,8 @@ class DiceRewardConfigRecordController extends BaseController
public function index(Request $request): Response public function index(Request $request): Response
{ {
$where = $request->more([ $where = $request->more([
['paid_planned_spins', ''],
['ante', ''],
]); ]);
$query = $this->logic->search($where); $query = $this->logic->search($where);
$data = $this->logic->getList($query); $data = $this->logic->getList($query);

View File

@@ -0,0 +1,90 @@
<?php
// +----------------------------------------------------------------------
// | saiadmin [ saiadmin快速开发框架 ]
// +----------------------------------------------------------------------
// | Author: your name
// +----------------------------------------------------------------------
namespace app\dice\logic\ante_config;
use app\dice\model\ante_config\DiceAnteConfig;
use plugin\saiadmin\basic\think\BaseLogic;
/**
* 底注配置逻辑层
*/
class DiceAnteConfigLogic extends BaseLogic
{
public function __construct()
{
$this->model = new DiceAnteConfig();
}
public function add(array $data): mixed
{
return $this->transaction(function () use ($data) {
$this->normalizeDefaultField($data);
if ((int) ($data['is_default'] ?? 0) === 1) {
$this->clearOtherDefaults();
}
return parent::add($data);
});
}
public function edit($id, array $data): mixed
{
return $this->transaction(function () use ($id, $data) {
$this->normalizeDefaultField($data);
if ((int) ($data['is_default'] ?? 0) === 1) {
$this->clearOtherDefaults((int) $id);
}
return parent::edit($id, $data);
});
}
/**
* 防止删除后全表无默认:若删除了默认项,自动把最小 id 设为默认。
*/
public function destroy($ids): bool
{
return $this->transaction(function () use ($ids) {
$idList = is_array($ids) ? $ids : explode(',', (string) $ids);
$intIds = [];
foreach ($idList as $v) {
$iv = (int) $v;
if ($iv > 0) {
$intIds[] = $iv;
}
}
if ($intIds === []) {
return false;
}
$deletedDefaultCount = $this->model->whereIn('id', $intIds)->where('is_default', 1)->count();
$result = $this->model->destroy($intIds);
if ($result && $deletedDefaultCount > 0) {
$first = $this->model->order('id', 'asc')->find();
if ($first) {
$this->model->where('id', (int) $first['id'])->update(['is_default' => 1]);
}
}
return (bool) $result;
});
}
private function normalizeDefaultField(array &$data): void
{
if (!array_key_exists('is_default', $data)) {
return;
}
$data['is_default'] = ((int) $data['is_default']) === 1 ? 1 : 0;
}
private function clearOtherDefaults(?int $excludeId = null): void
{
$query = $this->model->where('is_default', 1);
if ($excludeId !== null && $excludeId > 0) {
$query->where('id', '<>', $excludeId);
}
$query->update(['is_default' => 0]);
}
}

View File

@@ -22,6 +22,8 @@ class DicePlayRecordTestLogic extends BaseLogic
public function __construct() public function __construct()
{ {
$this->model = new DicePlayRecordTest(); $this->model = new DicePlayRecordTest();
// 默认按 id 倒序,保证列表默认显示最新记录
$this->setOrderField('id')->setOrderType('DESC');
} }
} }

View File

@@ -5,6 +5,7 @@
namespace app\dice\logic\reward_config_record; namespace app\dice\logic\reward_config_record;
use app\dice\model\lottery_pool_config\DiceLotteryPoolConfig; use app\dice\model\lottery_pool_config\DiceLotteryPoolConfig;
use app\dice\model\ante_config\DiceAnteConfig;
use app\dice\model\reward\DiceReward; use app\dice\model\reward\DiceReward;
use app\dice\model\reward\DiceRewardConfig; use app\dice\model\reward\DiceRewardConfig;
use app\dice\model\reward_config_record\DiceRewardConfigRecord; use app\dice\model\reward_config_record\DiceRewardConfigRecord;
@@ -14,6 +15,7 @@ use plugin\saiadmin\app\model\system\SystemUser;
/** /**
* 奖励配置权重测试记录逻辑层 * 奖励配置权重测试记录逻辑层
*
*/ */
class DiceRewardConfigRecordLogic extends BaseLogic class DiceRewardConfigRecordLogic extends BaseLogic
{ {
@@ -228,10 +230,10 @@ class DiceRewardConfigRecordLogic extends BaseLogic
} }
/** /**
* 创建一键测试权重记录并返回 ID供后台执行器按付费/免费、顺逆方向交替写入 dice_play_record_test * 创建一键测试权重记录并返回 ID供后台执行器写入 dice_play_record_test
* 支持两种模式1选择奖池配置 lottery_config_id档位概率取自配置2不选配置使用自定义 paid_tier_weights / free_tier_weights * 支持两种模式1选择奖池配置 lottery_config_id档位概率取自配置2不选配置使用自定义 paid_tier_weights / free_tier_weights
* @param array|int $params 数组lottery_config_id(可选), paid_s_count, paid_n_count, free_s_count, free_n_count或兼容旧版传 4 个 int 时视为 (paid_s_count, paid_n_count, free_s_count, free_n_count) * @param array|int $params 数组lottery_config_id(可选), paid_s_count, paid_n_count
* @param int|null $adminId 执行人(旧版 4 参调用时第二参为 paid_n_count此处不传 adminId * @param int|null $adminId 执行人
* @return int 记录 ID * @return int 记录 ID
* @throws ApiException * @throws ApiException
*/ */
@@ -239,17 +241,24 @@ class DiceRewardConfigRecordLogic extends BaseLogic
{ {
$adminId = null; $adminId = null;
if (!is_array($params)) { if (!is_array($params)) {
// 兼容旧版调用createWeightTestRecord(paid_s_count, paid_n_count, free_s_count, free_n_count) // 兼容旧版调用createWeightTestRecord(paid_s_count, paid_n_count)
$params = [ $params = [
'paid_s_count' => (int) $params, 'paid_s_count' => (int) $params,
'paid_n_count' => (int) $adminIdOrFreeS, 'paid_n_count' => (int) $adminIdOrFreeS,
'free_s_count' => (int) $freeSOrFreeN,
'free_n_count' => (int) $freeN,
]; ];
} else { } else {
$adminId = $adminIdOrFreeS !== null && $adminIdOrFreeS !== '' ? (int) $adminIdOrFreeS : null; $adminId = $adminIdOrFreeS !== null && $adminIdOrFreeS !== '' ? (int) $adminIdOrFreeS : null;
} }
$allowed = [100, 500, 1000, 5000]; $allowed = [100, 500, 1000, 5000];
$ante = isset($params['ante']) ? intval($params['ante']) : 1;
if ($ante <= 0) {
throw new ApiException('ante must be greater than 0');
}
$anteExists = DiceAnteConfig::where('mult', $ante)->count();
if ($anteExists <= 0) {
throw new ApiException('ante not allowed: ' . $ante);
}
$lotteryConfigId = isset($params['lottery_config_id']) ? (int) $params['lottery_config_id'] : 0; $lotteryConfigId = isset($params['lottery_config_id']) ? (int) $params['lottery_config_id'] : 0;
$paidConfigId = isset($params['paid_lottery_config_id']) ? (int) $params['paid_lottery_config_id'] : 0; $paidConfigId = isset($params['paid_lottery_config_id']) ? (int) $params['paid_lottery_config_id'] : 0;
$freeConfigId = isset($params['free_lottery_config_id']) ? (int) $params['free_lottery_config_id'] : 0; $freeConfigId = isset($params['free_lottery_config_id']) ? (int) $params['free_lottery_config_id'] : 0;
@@ -259,19 +268,23 @@ class DiceRewardConfigRecordLogic extends BaseLogic
if ($freeConfigId <= 0 && $lotteryConfigId > 0) { if ($freeConfigId <= 0 && $lotteryConfigId > 0) {
$freeConfigId = $lotteryConfigId; $freeConfigId = $lotteryConfigId;
} }
$paidS = isset($params['paid_s_count']) ? (int) $params['paid_s_count'] : (int) ($params['s_count'] ?? 0); $paidS = isset($params['paid_s_count']) ? (int) $params['paid_s_count'] : 0;
$paidN = isset($params['paid_n_count']) ? (int) $params['paid_n_count'] : (int) ($params['n_count'] ?? 0); $paidN = isset($params['paid_n_count']) ? (int) $params['paid_n_count'] : 0;
$freeS = (int) ($params['free_s_count'] ?? 0); $chainFreeMode = !empty($params['chain_free_mode']);
$freeN = (int) ($params['free_n_count'] ?? 0); $killModeEnabled = !empty($params['kill_mode_enabled']);
$testSafetyLine = isset($params['test_safety_line']) ? (int) $params['test_safety_line'] : 5000;
if ($testSafetyLine < 0) {
throw new ApiException('test_safety_line must be greater than or equal to 0');
}
foreach ([$paidS, $paidN, $freeS, $freeN] as $c) { foreach ([$paidS, $paidN] as $c) {
if ($c !== 0 && !in_array($c, $allowed, true)) { if ($c !== 0 && !in_array($c, $allowed, true)) {
throw new ApiException('Counts only support 0, 100, 500, 1000, 5000'); throw new ApiException('Counts only support 0, 100, 500, 1000, 5000');
} }
} }
$total = $paidS + $paidN + $freeS + $freeN; $total = $paidS + $paidN;
if ($total <= 0) { if ($total <= 0) {
throw new ApiException('Sum of paid/free direction counts must be greater than 0'); throw new ApiException('Sum of paid direction counts must be greater than 0');
} }
$snapshot = []; $snapshot = [];
@@ -384,29 +397,36 @@ class DiceRewardConfigRecordLogic extends BaseLogic
if (!is_array($tierWeightsSnapshot['free'])) { if (!is_array($tierWeightsSnapshot['free'])) {
$tierWeightsSnapshot['free'] = []; $tierWeightsSnapshot['free'] = [];
} }
if ($chainFreeMode) {
$tierWeightsSnapshot['chain_free_mode'] = true;
}
$record = new DiceRewardConfigRecord(); $record = new DiceRewardConfigRecord();
$record->test_count = $total; $plannedPaidSpins = $paidS + $paidN;
$record->chain_free_mode = $chainFreeMode ? 1 : 0;
$record->kill_mode_enabled = $killModeEnabled ? 1 : 0;
$record->test_safety_line = $testSafetyLine;
$record->paid_planned_spins = $plannedPaidSpins;
// 总抽奖次数与 test_count 仅在任务成功结束时写入(见 WeightTestRunner::markSuccess
$record->test_count = 0;
$record->total_play_count = 0;
$record->weight_config_snapshot = $snapshot; $record->weight_config_snapshot = $snapshot;
$record->tier_weights_snapshot = $tierWeightsSnapshot; $record->tier_weights_snapshot = $tierWeightsSnapshot;
$record->lottery_config_id = $lotteryConfigId > 0 ? $lotteryConfigId : null; $record->lottery_config_id = $lotteryConfigId > 0 ? $lotteryConfigId : null;
$record->paid_lottery_config_id = $paidConfigId > 0 ? $paidConfigId : null; $record->paid_lottery_config_id = $paidConfigId > 0 ? $paidConfigId : null;
$record->free_lottery_config_id = $freeConfigId > 0 ? $freeConfigId : null; $record->free_lottery_config_id = $freeConfigId > 0 ? $freeConfigId : null;
$record->total_play_count = $total;
$record->over_play_count = 0; $record->over_play_count = 0;
$record->status = DiceRewardConfigRecord::STATUS_RUNNING; $record->status = DiceRewardConfigRecord::STATUS_RUNNING;
$record->remark = null; $record->remark = null;
$record->s_count = $paidS + $paidN;
$record->n_count = $freeS + $freeN;
$record->paid_s_count = $paidS; $record->paid_s_count = $paidS;
$record->paid_n_count = $paidN; $record->paid_n_count = $paidN;
$record->free_s_count = $freeS; $record->play_again_count = 0;
$record->free_n_count = $freeN;
$record->paid_tier_weights = $paidTierWeights; $record->paid_tier_weights = $paidTierWeights;
$record->free_tier_weights = $freeTierWeights; $record->free_tier_weights = $freeTierWeights;
$record->result_counts = []; $record->result_counts = [];
$record->tier_counts = null; $record->tier_counts = null;
$record->bigwin_weight = $bigwinWeights ?: null; $record->bigwin_weight = $bigwinWeights ?: null;
$record->ante = $ante;
$record->admin_id = $adminId; $record->admin_id = $adminId;
$record->create_time = date('Y-m-d H:i:s'); $record->create_time = date('Y-m-d H:i:s');
$record->save(); $record->save();

View File

@@ -14,15 +14,34 @@ use support\think\Db;
/** /**
* 一键测试权重:单进程后台执行模拟摇色子,写入 dice_play_record_test 并更新 dice_reward_config_record 进度 * 一键测试权重:单进程后台执行模拟摇色子,写入 dice_play_record_test 并更新 dice_reward_config_record 进度
* 抽奖逻辑与 PlayStartLogic 一致:使用 name=default 的安全线、杀分开关;盈利<安全线时付费用玩家权重、免费用 killScore盈利>=安全线且杀分开启时付费/免费均用 killScore * 支持测试内杀分:当模拟玩家累计盈利达到安全线后,付费抽奖切换到 killScore
*/ */
class WeightTestRunner class WeightTestRunner
{ {
private const BATCH_SIZE = 10; 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 条写入一次测试表并更新进度 * 执行指定测试记录:按付费次数模拟,若命中 T5 则链式插入免费局(同方向同底注)
* 使用与 playStart 相同的彩金池逻辑name=default 的安全线/kill_enabled付费用 paid_tier_weights玩家权重或 killScore免费用 killScore
* @param int $recordId dice_reward_config_record.id * @param int $recordId dice_reward_config_record.id
*/ */
public function run(int $recordId): void public function run(int $recordId): void
@@ -33,22 +52,13 @@ class WeightTestRunner
return; return;
} }
$ante = is_numeric($record->ante ?? null) ? intval($record->ante) : 1;
$paidS = (int) ($record->paid_s_count ?? 0); $paidS = (int) ($record->paid_s_count ?? 0);
$paidN = (int) ($record->paid_n_count ?? 0); $paidN = (int) ($record->paid_n_count ?? 0);
$freeS = (int) ($record->free_s_count ?? 0); $total = $paidS + $paidN;
$freeN = (int) ($record->free_n_count ?? 0); if ($total <= 0) {
if ($paidS + $paidN + $freeS + $freeN <= 0) { $this->markFailed($recordId, '抽奖次数必须大于 0');
$sCount = (int) ($record->s_count ?? 0); return;
$nCount = (int) ($record->n_count ?? 0);
$total = $sCount + $nCount;
if ($total <= 0) {
$this->markFailed($recordId, '抽奖次数必须大于 0');
return;
}
$paidS = $sCount;
$paidN = $nCount;
} else {
$total = $paidS + $paidN + $freeS + $freeN;
} }
$configType0 = DiceLotteryPoolConfig::where('name', 'default')->find(); $configType0 = DiceLotteryPoolConfig::where('name', 'default')->find();
@@ -57,31 +67,47 @@ class WeightTestRunner
$this->markFailed($recordId, '彩金池配置 name=default 不存在'); $this->markFailed($recordId, '彩金池配置 name=default 不存在');
return; return;
} }
$safetyLine = (int) ($configType0->safety_line ?? 0);
$killEnabled = ((int) ($configType0->kill_enabled ?? 1)) === 1;
$paidTierWeights = (is_array($record->paid_tier_weights ?? null) && $record->paid_tier_weights !== []) $paidTierWeightsCustom = (is_array($record->paid_tier_weights ?? null) && $record->paid_tier_weights !== [])
? $record->paid_tier_weights ? $record->paid_tier_weights
: [ : null;
'T1' => (int) ($configType0->t1_weight ?? 0), $freeTierWeightsCustom = (is_array($record->free_tier_weights ?? null) && $record->free_tier_weights !== [])
'T2' => (int) ($configType0->t2_weight ?? 0), ? $record->free_tier_weights
'T3' => (int) ($configType0->t3_weight ?? 0), : null;
'T4' => (int) ($configType0->t4_weight ?? 0),
'T5' => (int) ($configType0->t5_weight ?? 0), $paidPoolConfigId = (int) ($record->paid_lottery_config_id ?? 0);
]; $freePoolConfigId = (int) ($record->free_lottery_config_id ?? 0);
if (array_sum($paidTierWeights) <= 0) {
$this->markFailed($recordId, '需提供 paid_tier_weights玩家权重盈利未达安全线时付费抽奖使用或选择 default 奖池'); $paidPoolConfig = $paidPoolConfigId > 0 ? DiceLotteryPoolConfig::find($paidPoolConfigId) : $configType0;
return; if (!$paidPoolConfig) {
$paidPoolConfig = $configType0;
}
$freePoolConfig = $freePoolConfigId > 0 ? DiceLotteryPoolConfig::find($freePoolConfigId) : $configType1;
if (!$freePoolConfig) {
$freePoolConfig = $configType0;
} }
$freeConfig = $configType1 !== null ? $configType1 : $configType0; if ($paidTierWeightsCustom !== null && array_sum($paidTierWeightsCustom) <= 0) {
$this->markFailed($recordId, 'paid_tier_weights玩家权重之和必须大于 0');
return;
}
if ($freeTierWeightsCustom !== null && array_sum($freeTierWeightsCustom) <= 0) {
$this->markFailed($recordId, 'free_tier_weights免费玩家权重之和必须大于 0');
return;
}
// 每次测试开始前清空进程内静态缓存,强制从共享缓存读取最新 BIGWIN/奖励配置,与数据库一致 // 每次测试开始前清空进程内静态缓存,强制从共享缓存读取最新 BIGWIN/奖励配置,与数据库一致
DiceRewardConfig::clearRequestInstance(); DiceRewardConfig::clearRequestInstance();
DiceReward::clearRequestInstance(); DiceReward::clearRequestInstance();
// 彩金池累计盈利:用于判断是否触发杀分(不再依赖单个玩家累计盈利) $killModeEnabled = (int) ($record->kill_mode_enabled ?? 0) === 1;
$poolProfitTotal = $configType0->profit_amount ?? 0; $testSafetyLine = (int) ($record->test_safety_line ?? 5000);
if ($testSafetyLine < 0) {
$testSafetyLine = 0;
}
// 测试内“玩家累计盈利”:用于控制付费局是否切换杀分
$playerProfitTotal = 0.0;
$playLogic = new PlayStartLogic(); $playLogic = new PlayStartLogic();
$resultCounts = []; $resultCounts = [];
@@ -90,47 +116,29 @@ class WeightTestRunner
$done = 0; $done = 0;
try { try {
for ($i = 0; $i < $paidS; $i++) { $this->runChainFreeMode(
$usePoolWeights = $killEnabled && $poolProfitTotal >= $safetyLine && $configType1 !== null; $recordId,
$paidConfig = $usePoolWeights ? $configType1 : $configType0; $playLogic,
$customWeights = $usePoolWeights ? null : $paidTierWeights; $paidS,
$row = $playLogic->simulateOnePlay($paidConfig, 0, 0, $customWeights); $paidN,
$this->accumulateProfitForDefault($row, 0, $paidConfig, $configType0, $poolProfitTotal); $ante,
$this->aggregate($row, $resultCounts, $tierCounts); $paidPoolConfig,
$buffer[] = $this->rowForInsert($row, $recordId); $freePoolConfig,
$done++; $configType1,
$this->flushIfNeeded($buffer, $recordId, $done, $total, $resultCounts, $tierCounts); $paidTierWeightsCustom,
} $freeTierWeightsCustom,
for ($i = 0; $i < $paidN; $i++) { $killModeEnabled,
$usePoolWeights = $killEnabled && $poolProfitTotal >= $safetyLine && $configType1 !== null; $testSafetyLine,
$paidConfig = $usePoolWeights ? $configType1 : $configType0; $playerProfitTotal,
$customWeights = $usePoolWeights ? null : $paidTierWeights; $resultCounts,
$row = $playLogic->simulateOnePlay($paidConfig, 1, 0, $customWeights); $tierCounts,
$this->accumulateProfitForDefault($row, 0, $paidConfig, $configType0, $poolProfitTotal); $buffer,
$this->aggregate($row, $resultCounts, $tierCounts); $done
$buffer[] = $this->rowForInsert($row, $recordId); );
$done++;
$this->flushIfNeeded($buffer, $recordId, $done, $total, $resultCounts, $tierCounts);
}
for ($i = 0; $i < $freeS; $i++) {
$row = $playLogic->simulateOnePlay($freeConfig, 0, 1, null);
$this->accumulateProfitForDefault($row, 1, $freeConfig, $configType0, $poolProfitTotal);
$this->aggregate($row, $resultCounts, $tierCounts);
$buffer[] = $this->rowForInsert($row, $recordId);
$done++;
$this->flushIfNeeded($buffer, $recordId, $done, $total, $resultCounts, $tierCounts);
}
for ($i = 0; $i < $freeN; $i++) {
$row = $playLogic->simulateOnePlay($freeConfig, 1, 1, null);
$this->accumulateProfitForDefault($row, 1, $freeConfig, $configType0, $poolProfitTotal);
$this->aggregate($row, $resultCounts, $tierCounts);
$buffer[] = $this->rowForInsert($row, $recordId);
$done++;
$this->flushIfNeeded($buffer, $recordId, $done, $total, $resultCounts, $tierCounts);
}
if (!empty($buffer)) { if (!empty($buffer)) {
$this->insertBuffer($buffer); $this->insertBuffer($buffer);
$this->updateProgress($recordId, $done, $resultCounts, $tierCounts); // 链式/非链式:运行中均不写入 total_play_count仅在 markSuccess 落库实际总次数
$this->updateProgress($recordId, $done, $resultCounts, $tierCounts, null);
} }
// 平台赚取金额:通过关联 DicePlayRecordTestreward_config_record_id统计 // 平台赚取金额:通过关联 DicePlayRecordTestreward_config_record_id统计
$this->markSuccess($recordId, $resultCounts, $tierCounts); $this->markSuccess($recordId, $resultCounts, $tierCounts);
@@ -141,19 +149,72 @@ class WeightTestRunner
} }
/** /**
* 累加彩金池累计盈利,用于触发杀分,与 PlayStartLogic 一致 * 付费次数仅由配置决定;付费抽到「再来一次」则在队列末尾插入一条免费抽奖(同方向、同底注),可链式触发
* @param int $lotteryType 0=付费券1=免费券
* @param object $usedConfig 本次使用的奖池配置(仅用于校验非空)
* @param object $configType0 name=default 的彩金池
* @param float $playerProfitTotal 实际为“彩金池累计盈利”滚动值
*/ */
private function accumulateProfitForDefault(array $row, int $lotteryType, $usedConfig, $configType0, float &$playerProfitTotal): void private function runChainFreeMode(
{ int $recordId,
if (($lotteryType !== 0 && $lotteryType !== 1) || $usedConfig === null || $configType0 === null || !isset($row['win_coin'])) { PlayStartLogic $playLogic,
return; int $paidS,
int $paidN,
int $ante,
$paidPoolConfig,
$freePoolConfig,
$killPoolConfig,
?array $paidTierWeightsCustom,
?array $freeTierWeightsCustom,
bool $killModeEnabled,
int $testSafetyLine,
float &$playerProfitTotal,
array &$resultCounts,
array &$tierCounts,
array &$buffer,
int &$done
): void {
$queue = [];
for ($i = 0; $i < $paidS; $i++) {
$queue[] = ['paid', 0, $ante];
}
for ($i = 0; $i < $paidN; $i++) {
$queue[] = ['paid', 1, $ante];
}
$qi = 0;
while ($qi < count($queue)) {
$item = $queue[$qi];
$isPaid = $item[0] === 'paid';
$dir = $item[1];
$playAnte = $item[2];
$lotteryType = $isPaid ? 0 : 1;
if ($isPaid) {
$useKillForPaid = $killModeEnabled && $playerProfitTotal >= $testSafetyLine && $killPoolConfig !== null;
if ($useKillForPaid) {
$cfg = $killPoolConfig;
$customWeights = null;
} else {
$cfg = $paidPoolConfig;
$customWeights = $paidTierWeightsCustom;
}
} else {
$cfg = $freePoolConfig;
$customWeights = $freeTierWeightsCustom;
}
$row = $playLogic->simulateOnePlay($cfg, $dir, $lotteryType, $playAnte, $customWeights);
$winCoin = (float) ($row['win_coin'] ?? 0);
$paidAmount = (float) ($row['paid_amount'] ?? 0);
$playerProfitTotal += $winCoin - $paidAmount;
$this->aggregate($row, $resultCounts, $tierCounts);
$buffer[] = $this->rowForInsert($row, $recordId);
$done++;
if (!empty($row['grants_free_ticket'])) {
$queue[] = ['free', $dir, $playAnte];
}
$this->flushIfNeeded($buffer, $recordId, $done, count($queue), $resultCounts, $tierCounts, null);
$qi++;
} }
$winCoin = (float) $row['win_coin'];
$playerProfitTotal += $lotteryType === 0 ? ($winCoin - 100.0) : $winCoin;
} }
private function aggregate(array $row, array &$resultCounts, array &$tierCounts): void private function aggregate(array $row, array &$resultCounts, array &$tierCounts): void
@@ -174,9 +235,10 @@ class WeightTestRunner
'reward_config_record_id' => $rewardConfigRecordId, 'reward_config_record_id' => $rewardConfigRecordId,
]; ];
$keys = [ $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',
'start_index', 'target_index', 'roll_array', 'roll_number', 'lottery_name', 'status', 'ante', 'paid_amount',
'start_index', 'target_index', 'roll_array', 'roll_number', 'status',
]; ];
foreach ($keys as $k) { foreach ($keys as $k) {
if (array_key_exists($k, $row)) { if (array_key_exists($k, $row)) {
@@ -186,14 +248,14 @@ class WeightTestRunner
return $out; return $out;
} }
private function flushIfNeeded(array &$buffer, int $recordId, int $done, int $total, array $resultCounts, array $tierCounts): void private function flushIfNeeded(array &$buffer, int $recordId, int $done, int $total, array $resultCounts, array $tierCounts, ?int $recordTotalPlayCount = null): void
{ {
if (count($buffer) < self::BATCH_SIZE) { if (count($buffer) < self::BATCH_SIZE) {
return; return;
} }
$this->insertBuffer($buffer); $this->insertBuffer($buffer);
$buffer = []; $buffer = [];
$this->updateProgress($recordId, $done, $resultCounts, $tierCounts); $this->updateProgress($recordId, $done, $resultCounts, $tierCounts, $recordTotalPlayCount);
} }
private function insertBuffer(array $rows): void private function insertBuffer(array $rows): void
@@ -202,15 +264,36 @@ class WeightTestRunner
return; return;
} }
foreach ($rows as $row) { 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 (!array_key_exists('create_time', $payload) || $payload['create_time'] === null || $payload['create_time'] === '') {
$payload['create_time'] = date('Y-m-d H:i:s');
}
if (!array_key_exists('update_time', $payload) || $payload['update_time'] === null || $payload['update_time'] === '') {
$payload['update_time'] = $payload['create_time'];
}
if ($payload === []) {
continue;
}
Db::name((new DicePlayRecordTest())->getTable())->insert($payload);
} }
} }
private function updateProgress(int $recordId, int $overPlayCount, array $resultCounts, array $tierCounts): void private function updateProgress(int $recordId, int $overPlayCount, array $resultCounts, array $tierCounts, ?int $totalPlayCount = null): void
{ {
$record = DiceRewardConfigRecord::find($recordId); $record = DiceRewardConfigRecord::find($recordId);
if ($record) { if ($record) {
$record->over_play_count = $overPlayCount; $record->over_play_count = $overPlayCount;
if ($totalPlayCount !== null) {
$record->total_play_count = $totalPlayCount;
}
$record->result_counts = $resultCounts; $record->result_counts = $resultCounts;
$record->tier_counts = $tierCounts; $record->tier_counts = $tierCounts;
$record->save(); $record->save();
@@ -219,7 +302,7 @@ class WeightTestRunner
/** /**
* 标记测试成功并记录平台总盈利 platform_profit * 标记测试成功并记录平台总盈利 platform_profit
* 通过关联 DicePlayRecordTestreward_config_record_id统计付费(lottery_type=0)次数×100 - win_coin 求和 * 通过关联 DicePlayRecordTestreward_config_record_id统计付费金额 paid_amount 求和 - win_coin 求和
*/ */
private function markSuccess(int $recordId, array $resultCounts, array $tierCounts): void private function markSuccess(int $recordId, array $resultCounts, array $tierCounts): void
{ {
@@ -235,6 +318,10 @@ class WeightTestRunner
$record->tier_counts = $tierCounts; $record->tier_counts = $tierCounts;
$record->remark = null; $record->remark = null;
$record->platform_profit = $platformProfit; $record->platform_profit = $platformProfit;
$record->play_again_count = DiceRewardConfigRecord::computePlayAgainCountFromRelated($recordId);
$actualCount = (int) DicePlayRecordTest::where('reward_config_record_id', $recordId)->count();
$record->total_play_count = $actualCount;
$record->test_count = $actualCount;
$record->save(); $record->save();
} }
} }

View File

@@ -0,0 +1,48 @@
<?php
// +----------------------------------------------------------------------
// | saiadmin [ saiadmin快速开发框架 ]
// +----------------------------------------------------------------------
// | Author: your name
// +----------------------------------------------------------------------
namespace app\dice\model\ante_config;
use plugin\saiadmin\basic\think\BaseModel;
/**
* 底注配置模型
*
* @property int $id ID
* @property string $name 名称
* @property string $title 标题
* @property int $is_default 是否默认底注0否 1是全表仅允许一条为1
* @property int $mult 底注倍率
* @property string $create_time 创建时间
* @property string $update_time 更新时间
*/
class DiceAnteConfig extends BaseModel
{
protected $pk = 'id';
protected $table = 'dice_ante_config';
public function searchNameAttr($query, $value): void
{
if ($value !== '' && $value !== null) {
$query->where('name', 'like', '%' . $value . '%');
}
}
public function searchTitleAttr($query, $value): void
{
if ($value !== '' && $value !== null) {
$query->where('title', 'like', '%' . $value . '%');
}
}
public function searchIsDefaultAttr($query, $value): void
{
if ($value !== '' && $value !== null) {
$query->where('is_default', (int) $value);
}
}
}

View File

@@ -25,7 +25,7 @@ use plugin\saiadmin\basic\think\BaseModel;
* @property $t3_weight T3池权重 * @property $t3_weight T3池权重
* @property $t4_weight T4池权重 * @property $t4_weight T4池权重
* @property $t5_weight T5池权重 * @property $t5_weight T5池权重
* @property $profit_amount 池子累计盈利(每局抽奖累加 100-real_ev仅展示不可编辑) * @property $profit_amount 池子累计盈利(每局付费按 win_coin-paid_amount免费按 win_coin 累加;仅展示不可编辑)
*/ */
class DiceLotteryPoolConfig extends BaseModel class DiceLotteryPoolConfig extends BaseModel
{ {

View File

@@ -22,12 +22,15 @@ use think\model\relation\BelongsTo;
* @property $admin_id 关联玩家所属管理员IDDicePlayer.admin_id * @property $admin_id 关联玩家所属管理员IDDicePlayer.admin_id
* @property $lottery_config_id 彩金池配置 * @property $lottery_config_id 彩金池配置
* @property $lottery_type 抽奖类型 * @property $lottery_type 抽奖类型
* @property $ante 底注/注数dice_ante_config.mult
* @property $paid_amount 付费金额(付费局=ante*1免费局=0
* @property $is_win 是否中大奖:豹子号[1,1,1,1,1]~[6,6,6,6,6]为1否则0 * @property $is_win 是否中大奖:豹子号[1,1,1,1,1]~[6,6,6,6,6]为1否则0
* @property $win_coin 赢取平台币(= super_win_coin + reward_win_coin * @property $win_coin 赢取平台币(= super_win_coin + reward_win_coin
* @property $super_win_coin 中大奖平台币(豹子时发放) * @property $super_win_coin 中大奖平台币(豹子时发放)
* @property $reward_win_coin 摇色子中奖平台币 * @property $reward_win_coin 摇色子中奖平台币
* @property $use_coins 消耗平台币(兼容字段:付费局=paid_amount免费局=0
* @property $direction 方向:0=顺时针,1=逆时针 * @property $direction 方向:0=顺时针,1=逆时针
* @property $reward_config_id 奖励配置id * @property $reward_tier 中奖档位T1,T2,T3,T4,T5,BIGWIN
* @property $lottery_id 奖池 * @property $lottery_id 奖池
* @property $start_index 起始索引 * @property $start_index 起始索引
* @property $target_index 结束索引 * @property $target_index 结束索引
@@ -61,15 +64,6 @@ class DicePlayRecord extends BaseModel
return $this->belongsTo(DicePlayer::class, 'player_id', 'id'); return $this->belongsTo(DicePlayer::class, 'player_id', 'id');
} }
/**
* 中奖配置
* 关联模型 diceRewardConfig
*/
public function diceRewardConfig(): BelongsTo
{
return $this->belongsTo(DiceRewardConfig::class, 'reward_config_id', 'id');
}
/** /**
* 彩金池配置 * 彩金池配置
* 关联模型 diceLotteryPoolConfig * 关联模型 diceLotteryPoolConfig
@@ -249,24 +243,19 @@ class DicePlayRecord extends BaseModel
} }
$ids = DiceRewardConfig::where('ui_text', 'like', '%' . $value . '%')->column('id'); $ids = DiceRewardConfig::where('ui_text', 'like', '%' . $value . '%')->column('id');
if (!empty($ids)) { if (!empty($ids)) {
$query->whereIn('reward_config_id', $ids); $query->whereIn('target_index', $ids);
} else { } else {
$query->whereRaw('1=0'); $query->whereRaw('1=0');
} }
} }
/** 按奖励档位(diceRewardConfig.tier中奖名 T1-T5 */ /** 按奖励档位(表字段 reward_tier中奖名 T1-T5/BIGWIN */
public function searchRewardTierAttr($query, $value) public function searchRewardTierAttr($query, $value)
{ {
if ($value === '' || $value === null) { if ($value === '' || $value === null) {
return; 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=逆时针 */ /** 方向 0=顺时针 1=逆时针 */

View File

@@ -7,7 +7,6 @@
namespace app\dice\model\play_record_test; namespace app\dice\model\play_record_test;
use plugin\saiadmin\basic\think\BaseModel; 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\reward_config_record\DiceRewardConfigRecord;
use app\dice\model\lottery_pool_config\DiceLotteryPoolConfig; use app\dice\model\lottery_pool_config\DiceLotteryPoolConfig;
use think\model\relation\BelongsTo; use think\model\relation\BelongsTo;
@@ -19,11 +18,13 @@ use think\model\relation\BelongsTo;
* *
* @property $id ID * @property $id ID
* @property $lottery_config_id 彩金池配置id * @property $lottery_config_id 彩金池配置id
* @property $lottery_type 抽奖类型:0=付费,1=赠送 * @property $lottery_type 抽奖类型:0=付费,1=免费
* @property $is_win 中大奖:0=无,1=中奖 * @property $is_win 中大奖:0=无,1=中奖
* @property $win_coin 赢取平台币 * @property $win_coin 赢取平台币
* @property int|null $ante 底注/注数dice_ante_config.mult
* @property int|null $paid_amount 付费金额(付费局=ante*1免费局=0
* @property $direction 方向:0=顺时针,1=逆时针 * @property $direction 方向:0=顺时针,1=逆时针
* @property $reward_config_id 奖励配置id * @property $reward_tier 中奖档位T1,T2,T3,T4,T5,BIGWIN
* @property $create_time 创建时间 * @property $create_time 创建时间
* @property $update_time 修改时间 * @property $update_time 修改时间
* @property $start_index 起始索引 * @property $start_index 起始索引
@@ -50,6 +51,10 @@ class DicePlayRecordTest extends BaseModel
*/ */
protected $table = 'dice_play_record_test'; protected $table = 'dice_play_record_test';
protected $createTime = 'create_time';
protected $updateTime = 'update_time';
/** /**
* 彩金池配置 * 彩金池配置
* 关联 lottery_config_id -> DiceLotteryPoolConfig.id * 关联 lottery_config_id -> DiceLotteryPoolConfig.id
@@ -59,15 +64,6 @@ class DicePlayRecordTest extends BaseModel
return $this->belongsTo(DiceLotteryPoolConfig::class, 'lottery_config_id', 'id'); 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 * reward_config_record_id -> DiceRewardConfigRecord.id
@@ -77,7 +73,7 @@ class DicePlayRecordTest extends BaseModel
return $this->belongsTo(DiceRewardConfigRecord::class, 'reward_config_record_id', 'id'); return $this->belongsTo(DiceRewardConfigRecord::class, 'reward_config_record_id', 'id');
} }
/** 抽奖类型 0=付费 1=赠送 */ /** 抽奖类型 0=付费 1=免费 */
public function searchLotteryTypeAttr($query, $value) public function searchLotteryTypeAttr($query, $value)
{ {
if ($value !== '' && $value !== null) { if ($value !== '' && $value !== null) {
@@ -117,18 +113,29 @@ class DicePlayRecordTest extends BaseModel
} }
} }
/** 中奖档位(按 reward_config_id 对应 DiceRewardConfig.tier */ /** 付费金额(付费局=ante*1免费局=0 */
public function searchPaidAmountAttr($query, $value)
{
if ($value !== '' && $value !== null) {
$query->where('paid_amount', '=', $value);
}
}
/** 底注/注数dice_ante_config.mult */
public function searchAnteAttr($query, $value)
{
if ($value !== '' && $value !== null) {
$query->where('ante', '=', $value);
}
}
/** 中奖档位(按表字段 reward_tier */
public function searchRewardTierAttr($query, $value) public function searchRewardTierAttr($query, $value)
{ {
if ($value === '' || $value === null) { if ($value === '' || $value === null) {
return; 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 */ /** 点数和 roll_number摇取点数和 5-30 */
@@ -138,4 +145,12 @@ class DicePlayRecordTest extends BaseModel
$query->where('roll_number', '=', $value); $query->where('roll_number', '=', $value);
} }
} }
/** 关联 dice_reward_config_record.id权重测试记录 */
public function searchRewardConfigRecordIdAttr($query, $value)
{
if ($value !== '' && $value !== null) {
$query->where('reward_config_record_id', '=', $value);
}
}
} }

View File

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

View File

@@ -19,6 +19,7 @@ use think\model\relation\BelongsTo;
* @property $player_id 玩家id * @property $player_id 玩家id
* @property $admin_id 关联玩家所属管理员IDDicePlayer.admin_id * @property $admin_id 关联玩家所属管理员IDDicePlayer.admin_id
* @property $use_coins 消耗硬币 * @property $use_coins 消耗硬币
* @property $ante 底注/注数历史购买记录默认为1T5再来一次写入本次注数
* @property $total_ticket_count 总抽奖次数 * @property $total_ticket_count 总抽奖次数
* @property $paid_ticket_count 购买抽奖次数 * @property $paid_ticket_count 购买抽奖次数
* @property $free_ticket_count 赠送抽奖次数 * @property $free_ticket_count 赠送抽奖次数
@@ -143,4 +144,12 @@ class DicePlayerTicketRecord extends BaseModel
$query->where('create_time', '<=', $value); $query->where('create_time', '<=', $value);
} }
} }
/** 底注/注数ante */
public function searchAnteAttr($query, $value)
{
if ($value !== '' && $value !== null) {
$query->where('ante', '=', $value);
}
}
} }

View File

@@ -22,21 +22,23 @@ use think\model\relation\HasMany;
* @property int|null $lottery_config_id 测试时使用的奖池配置 ID兼容旧付费+免费共用) * @property int|null $lottery_config_id 测试时使用的奖池配置 ID兼容旧付费+免费共用)
* @property int|null $paid_lottery_config_id 付费抽奖奖池配置 ID默认 type=0 * @property int|null $paid_lottery_config_id 付费抽奖奖池配置 ID默认 type=0
* @property int|null $free_lottery_config_id 免费抽奖奖池配置 ID默认 type=1 * @property int|null $free_lottery_config_id 免费抽奖奖池配置 ID默认 type=1
* @property int $total_play_count 总模拟次数s_count+n_count * @property int $total_play_count 总模拟次数
* @property int $over_play_count 已完成次数 * @property int $over_play_count 已完成次数
* @property int $status 状态 -1失败 0进行中 1成功 * @property int $status 状态 -1失败 0进行中 1成功
* @property string|null $remark 失败时记录原因 * @property string|null $remark 失败时记录原因
* @property int $s_count 顺时针模拟次数(兼容旧数据 * @property int|null $ante 底注/注数dice_ante_config.mult
* @property int $n_count 逆时针模拟次数(兼容旧数据)
* @property int $paid_s_count 付费抽奖顺时针次数 * @property int $paid_s_count 付费抽奖顺时针次数
* @property int $paid_n_count 付费抽奖逆时针次数 * @property int $paid_n_count 付费抽奖逆时针次数
* @property int $free_s_count 免费抽奖顺时针次数 * @property int $chain_free_mode 1=链式再来一次免费抽奖
* @property int $free_n_count 免费抽奖逆时针次数 * @property int $kill_mode_enabled 测试内杀分开关 1=开启
* @property int $test_safety_line 测试内安全线(模拟玩家累计盈利阈值)
* @property int $paid_planned_spins 计划付费抽奖次数(顺+逆)
* @property int $play_again_count 再来一次次数(T5触发次数)
* @property array|null $paid_tier_weights 付费自定义档位权重 T1-T5 * @property array|null $paid_tier_weights 付费自定义档位权重 T1-T5
* @property array|null $free_tier_weights 免费自定义档位权重 T1-T5 * @property array|null $free_tier_weights 免费自定义档位权重 T1-T5
* @property array $result_counts 落点统计 grid_number=>出现次数 * @property array $result_counts 落点统计 grid_number=>出现次数
* @property array|null $tier_counts 档位出现次数 T1=>count * @property array|null $tier_counts 档位出现次数 T1=>count
* @property float|null $platform_profit 平台赚取金额(付费抽取次数×100-玩家总收益) * @property float|null $platform_profit 平台赚取金额(付费金额 paid_amount 求和-玩家总收益)
* @property array|null $bigwin_weight 测试时 BIGWIN 档位权重快照JSONgrid_number=>weight * @property array|null $bigwin_weight 测试时 BIGWIN 档位权重快照JSONgrid_number=>weight
* @property int|null $admin_id 执行测试的管理员ID * @property int|null $admin_id 执行测试的管理员ID
* @property string|null $create_time 创建时间 * @property string|null $create_time 创建时间
@@ -68,20 +70,48 @@ class DiceRewardConfigRecord extends BaseModel
return $this->hasMany(DicePlayRecordTest::class, 'reward_config_record_id', 'id'); return $this->hasMany(DicePlayRecordTest::class, 'reward_config_record_id', 'id');
} }
/** 计划付费抽奖次数(顺+逆) */
public function searchPaidPlannedSpinsAttr($query, $value): void
{
if ($value !== '' && $value !== null) {
$query->where('paid_planned_spins', '=', $value);
}
}
/** 底注/注数dice_ante_config.mult */
public function searchAnteAttr($query, $value): void
{
if ($value !== '' && $value !== null) {
$query->where('ante', '=', $value);
}
}
/** /**
* 根据关联的 DicePlayRecordTest 统计平台赚取平台币 * 根据关联的 DicePlayRecordTest 统计平台赚取平台币
* platform_profit = 关联的付费(lottery_type=0)抽取次数 × 100 - 关联的 win_coin 求和 * platform_profit = 关联的付费(lottery_type=0)付费金额求和(paid_amount) - 关联的 win_coin 求和
* @param int $recordId dice_reward_config_record.id * @param int $recordId dice_reward_config_record.id
* @return float * @return float
*/ */
public static function computePlatformProfitFromRelated(int $recordId): float public static function computePlatformProfitFromRelated(int $recordId): float
{ {
$paidCount = DicePlayRecordTest::where('reward_config_record_id', $recordId) $paidAmount = (float) DicePlayRecordTest::where('reward_config_record_id', $recordId)
->where('lottery_type', 0) ->where('lottery_type', 0)
->count(); ->sum('paid_amount');
$sumWinCoin = (float) DicePlayRecordTest::where('reward_config_record_id', $recordId) $sumWinCoin = (float) DicePlayRecordTest::where('reward_config_record_id', $recordId)
->sum('win_coin'); ->sum('win_coin');
return round($paidCount * 100 - $sumWinCoin, 2); return round($paidAmount - $sumWinCoin, 2);
}
/**
* 根据关联的 DicePlayRecordTest 统计再来一次次数reward_tier=T5
* @param int $recordId
* @return int
*/
public static function computePlayAgainCountFromRelated(int $recordId): int
{
return (int) DicePlayRecordTest::where('reward_config_record_id', $recordId)
->where('reward_tier', 'T5')
->count();
} }
/** /**

View File

@@ -0,0 +1,34 @@
<?php
// +----------------------------------------------------------------------
// | saiadmin [ saiadmin快速开发框架 ]
// +----------------------------------------------------------------------
// | Author: your name
// +----------------------------------------------------------------------
namespace app\dice\validate\ante_config;
use plugin\saiadmin\basic\BaseValidate;
/**
* 底注配置验证器
*/
class DiceAnteConfigValidate extends BaseValidate
{
protected $rule = [
'name' => 'require|max:64',
'title' => 'require|max:255',
'is_default' => 'require|in:0,1',
'mult' => 'require|integer|gt:0',
];
protected $message = [
'name' => '名称必须填写',
'title' => '标题必须填写',
'is_default' => '默认底注标记必须为 0 或 1',
'mult' => '底注倍率必须为大于 0 的整数',
];
protected $scene = [
'save' => ['name', 'title', 'is_default', 'mult'],
'update' => ['name', 'title', 'is_default', 'mult'],
];
}

View File

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

View File

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

15
server/app/view/404.html Normal file
View File

@@ -0,0 +1,15 @@
<!DOCTYPE html>
<html lang="zh-CN">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title><?= $message ?></title>
<style>
body { font-family: system-ui, sans-serif; text-align: center; margin-top: 4rem; color: #333; }
h1 { font-size: 1.5rem; font-weight: 600; }
</style>
</head>
<body>
<h1><?= $message ?></h1>
</body>
</html>

View File

@@ -22,7 +22,7 @@ return [
'dirname' => function () { 'dirname' => function () {
return date('Ymd'); return date('Ymd');
}, },
'domain' => 'http://127.0.0.1:6688', 'domain' => 'http://127.0.0.1:8989',
'uri' => '/runtime', // 如果 domain + uri 不在 public 目录下请做好软链接否则生成的url无法访问 'uri' => '/runtime', // 如果 domain + uri 不在 public 目录下请做好软链接否则生成的url无法访问
'algo' => 'sha1', 'algo' => 'sha1',
], ],

View File

@@ -16,9 +16,15 @@
use Webman\Channel\Server; use Webman\Channel\Server;
use Workerman\Protocols\Frame; use Workerman\Protocols\Frame;
$listenHost = env('WEBMAN_CHANNEL_LISTEN_HOST', '0.0.0.0');
$listenPort = filter_var(env('WEBMAN_CHANNEL_PORT'), FILTER_VALIDATE_INT);
if ($listenPort === false) {
$listenPort = 2207;
}
return [ return [
'server' => [ 'server' => [
'listen' => 'frame://0.0.0.0:2206', 'listen' => 'frame://' . $listenHost . ':' . $listenPort,
'protocol' => Frame::class, 'protocol' => Frame::class,
'handler' => Server::class, 'handler' => Server::class,
'reloadable' => false, 'reloadable' => false,

View File

@@ -21,7 +21,7 @@ global $argv;
return [ return [
'webman' => [ 'webman' => [
'handler' => Http::class, 'handler' => Http::class,
'listen' => 'http://0.0.0.0:6688', 'listen' => 'http://0.0.0.0:8989',
'count' => cpu_count() * 4, 'count' => cpu_count() * 4,
'user' => '', 'user' => '',
'group' => '', 'group' => '',

View File

@@ -46,9 +46,13 @@ Route::group('/api', function () {
Route::any('/user/walletRecord', [app\api\controller\UserController::class, 'walletRecord']); Route::any('/user/walletRecord', [app\api\controller\UserController::class, 'walletRecord']);
Route::any('/user/playGameRecord', [app\api\controller\UserController::class, 'playGameRecord']); Route::any('/user/playGameRecord', [app\api\controller\UserController::class, 'playGameRecord']);
Route::any('/game/config', [app\api\controller\GameController::class, 'config']); 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/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']); Route::any('/game/playStart', [app\api\controller\GameController::class, 'playStart']);
})->middleware([ })->middleware([
TokenMiddleware::class, TokenMiddleware::class,
]); ]);
// 关闭主应用默认路由(/controller/action 隐式映射),未在本文件显式注册的路径返回 404
Route::disableDefaultRoute('');

View File

@@ -0,0 +1,17 @@
-- 底注配置表
CREATE TABLE IF NOT EXISTS `dice_ante_config` (
`id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',
`name` varchar(64) NOT NULL COMMENT '名称',
`title` varchar(255) NOT NULL COMMENT '标题',
`is_default` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否默认底注0否 1是全表只允许一条',
`mult` int NOT NULL DEFAULT 1 COMMENT '底注倍率',
`create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
PRIMARY KEY (`id`),
KEY `idx_is_default` (`is_default`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Dice 底注配置表';
-- 可选初始化数据(保留一条默认底注)
INSERT INTO `dice_ante_config` (`name`, `title`, `is_default`, `mult`)
SELECT 'default', '默认底注', 1, 1
WHERE NOT EXISTS (SELECT 1 FROM `dice_ante_config` LIMIT 1);

View File

@@ -0,0 +1,62 @@
-- 底注配置菜单与权限
-- 说明默认挂载在「大富翁」目录path=/dice若不存在则自动创建目录。
SET @now = NOW();
-- 1) 找到或创建 Dice 顶级目录
SET @dice_root_id = (
SELECT `id` FROM `sa_system_menu`
WHERE `path` = '/dice' AND `type` = 1
ORDER BY `id` ASC LIMIT 1
);
INSERT INTO `sa_system_menu`
(`parent_id`,`name`,`code`,`slug`,`type`,`path`,`component`,`method`,`icon`,`sort`,`is_iframe`,`is_keep_alive`,`is_hidden`,`is_fixed_tab`,`is_full_page`,`generate_id`,`generate_key`,`status`,`create_time`,`update_time`)
SELECT 0, '大富翁', 'Dice', NULL, 1, '/dice', NULL, NULL, 'ri:gamepad-line', 100, 2, 2, 2, 2, 2, 0, NULL, 1, @now, @now
WHERE @dice_root_id IS NULL;
SET @dice_root_id = (
SELECT `id` FROM `sa_system_menu`
WHERE `path` = '/dice' AND `type` = 1
ORDER BY `id` ASC LIMIT 1
);
-- 2) 创建底注配置菜单
INSERT INTO `sa_system_menu`
(`parent_id`,`name`,`code`,`slug`,`type`,`path`,`component`,`method`,`icon`,`sort`,`is_iframe`,`is_keep_alive`,`is_hidden`,`is_fixed_tab`,`is_full_page`,`generate_id`,`generate_key`,`status`,`create_time`,`update_time`)
SELECT @dice_root_id, '底注配置', 'AnteConfig', NULL, 2, 'ante_config', '/dice/ante_config/index', NULL, 'ri:coins-line', 92, 2, 2, 2, 2, 2, 0, NULL, 1, @now, @now
WHERE NOT EXISTS (
SELECT 1 FROM `sa_system_menu` WHERE `path` = 'ante_config' AND `component` = '/dice/ante_config/index' AND `type` = 2
);
SET @ante_menu_id = (
SELECT `id` FROM `sa_system_menu`
WHERE `path` = 'ante_config' AND `component` = '/dice/ante_config/index' AND `type` = 2
ORDER BY `id` ASC LIMIT 1
);
-- 3) 创建按钮权限
INSERT INTO `sa_system_menu`
(`parent_id`,`name`,`code`,`slug`,`type`,`path`,`component`,`method`,`sort`,`is_iframe`,`is_keep_alive`,`is_hidden`,`is_fixed_tab`,`is_full_page`,`generate_id`,`generate_key`,`status`,`create_time`,`update_time`)
SELECT @ante_menu_id, '数据列表', '', 'dice:ante_config:index:index', 3, '', '', '', 100, 2, 2, 2, 2, 2, 0, NULL, 1, @now, @now
WHERE NOT EXISTS (SELECT 1 FROM `sa_system_menu` WHERE `slug` = 'dice:ante_config:index:index' AND `type` = 3);
INSERT INTO `sa_system_menu`
(`parent_id`,`name`,`code`,`slug`,`type`,`path`,`component`,`method`,`sort`,`is_iframe`,`is_keep_alive`,`is_hidden`,`is_fixed_tab`,`is_full_page`,`generate_id`,`generate_key`,`status`,`create_time`,`update_time`)
SELECT @ante_menu_id, '读取', '', 'dice:ante_config:index:read', 3, '', '', '', 100, 2, 2, 2, 2, 2, 0, NULL, 1, @now, @now
WHERE NOT EXISTS (SELECT 1 FROM `sa_system_menu` WHERE `slug` = 'dice:ante_config:index:read' AND `type` = 3);
INSERT INTO `sa_system_menu`
(`parent_id`,`name`,`code`,`slug`,`type`,`path`,`component`,`method`,`sort`,`is_iframe`,`is_keep_alive`,`is_hidden`,`is_fixed_tab`,`is_full_page`,`generate_id`,`generate_key`,`status`,`create_time`,`update_time`)
SELECT @ante_menu_id, '添加', '', 'dice:ante_config:index:save', 3, '', '', '', 100, 2, 2, 2, 2, 2, 0, NULL, 1, @now, @now
WHERE NOT EXISTS (SELECT 1 FROM `sa_system_menu` WHERE `slug` = 'dice:ante_config:index:save' AND `type` = 3);
INSERT INTO `sa_system_menu`
(`parent_id`,`name`,`code`,`slug`,`type`,`path`,`component`,`method`,`sort`,`is_iframe`,`is_keep_alive`,`is_hidden`,`is_fixed_tab`,`is_full_page`,`generate_id`,`generate_key`,`status`,`create_time`,`update_time`)
SELECT @ante_menu_id, '修改', '', 'dice:ante_config:index:update', 3, '', '', '', 100, 2, 2, 2, 2, 2, 0, NULL, 1, @now, @now
WHERE NOT EXISTS (SELECT 1 FROM `sa_system_menu` WHERE `slug` = 'dice:ante_config:index:update' AND `type` = 3);
INSERT INTO `sa_system_menu`
(`parent_id`,`name`,`code`,`slug`,`type`,`path`,`component`,`method`,`sort`,`is_iframe`,`is_keep_alive`,`is_hidden`,`is_fixed_tab`,`is_full_page`,`generate_id`,`generate_key`,`status`,`create_time`,`update_time`)
SELECT @ante_menu_id, '删除', '', 'dice:ante_config:index:destroy', 3, '', '', '', 100, 2, 2, 2, 2, 2, 0, NULL, 1, @now, @now
WHERE NOT EXISTS (SELECT 1 FROM `sa_system_menu` WHERE `slug` = 'dice:ante_config:index:destroy' AND `type` = 3);

View File

@@ -0,0 +1,4 @@
-- DicePlayRecord 新增注数与付费金额字段
ALTER TABLE `dice_play_record`
ADD COLUMN `ante` int unsigned NOT NULL DEFAULT 1 COMMENT '底注/注数(必须为 dice_ante_config.mult 中存在的值)' AFTER `lottery_type`,
ADD COLUMN `paid_amount` int unsigned NOT NULL DEFAULT 0 COMMENT '付费金额(付费局=ante*1免费局=0' AFTER `ante`;

View File

@@ -0,0 +1,3 @@
-- DicePlayerTicketRecord 新增注数字段(用于记录“再来一次”免费抽奖的注数)
ALTER TABLE `dice_player_ticket_record`
ADD COLUMN `ante` int unsigned NOT NULL DEFAULT 1 COMMENT '底注/注数历史购买记录默认为1' AFTER `use_coins`;

View File

@@ -20,6 +20,20 @@ use plugin\saiadmin\exception\ApiException;
*/ */
class CrontabLogic extends BaseLogic class CrontabLogic extends BaseLogic
{ {
/**
* 获取 webman channel 服务地址
* 需要保证与 server/config/plugin/webman/channel/process.php 的 listen 端口一致
*/
private function channelConfig(): array
{
$host = env('WEBMAN_CHANNEL_HOST', '127.0.0.1');
$port = filter_var(env('WEBMAN_CHANNEL_PORT'), FILTER_VALIDATE_INT);
if ($port === false) {
$port = 2207;
}
return ['host' => $host, 'port' => $port];
}
/** /**
* 构造函数 * 构造函数
*/ */
@@ -67,7 +81,8 @@ class CrontabLogic extends BaseLogic
$id = $model->getKey(); $id = $model->getKey();
// 连接到Channel服务 // 连接到Channel服务
ChannelClient::connect(); $channel = $this->channelConfig();
ChannelClient::connect($channel['host'], $channel['port']);
ChannelClient::publish('crontab', ['args' => $id]); ChannelClient::publish('crontab', ['args' => $id]);
return true; return true;
@@ -116,7 +131,8 @@ class CrontabLogic extends BaseLogic
]); ]);
if ($result) { if ($result) {
// 连接到Channel服务 // 连接到Channel服务
ChannelClient::connect(); $channel = $this->channelConfig();
ChannelClient::connect($channel['host'], $channel['port']);
ChannelClient::publish('crontab', ['args' => $id]); ChannelClient::publish('crontab', ['args' => $id]);
} }
@@ -141,7 +157,8 @@ class CrontabLogic extends BaseLogic
$result = parent::destroy($ids); $result = parent::destroy($ids);
if ($result) { if ($result) {
// 连接到Channel服务 // 连接到Channel服务
ChannelClient::connect(); $channel = $this->channelConfig();
ChannelClient::connect($channel['host'], $channel['port']);
ChannelClient::publish('crontab', ['args' => $ids]); ChannelClient::publish('crontab', ['args' => $ids]);
} }
return $result; return $result;
@@ -162,7 +179,8 @@ class CrontabLogic extends BaseLogic
$result = $model->save(['status' => $status]); $result = $model->save(['status' => $status]);
if ($result) { if ($result) {
// 连接到Channel服务 // 连接到Channel服务
ChannelClient::connect(); $channel = $this->channelConfig();
ChannelClient::connect($channel['host'], $channel['port']);
ChannelClient::publish('crontab', ['args' => $id]); ChannelClient::publish('crontab', ['args' => $id]);
} }
return $result; return $result;

View File

@@ -97,7 +97,6 @@ Route::group('/core', function () {
fastRoute('dice/play_record/DicePlayRecord', \app\dice\controller\play_record\DicePlayRecordController::class); 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/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/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); 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/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']); Route::get('/dice/player_wallet_record/DicePlayerWalletRecord/getPlayerWalletBefore', [\app\dice\controller\player_wallet_record\DicePlayerWalletRecordController::class, 'getPlayerWalletBefore']);
@@ -118,6 +117,7 @@ Route::group('/core', function () {
Route::post('/dice/reward_config/DiceRewardConfig/batchUpdate', [\app\dice\controller\reward_config\DiceRewardConfigController::class, 'batchUpdate']); Route::post('/dice/reward_config/DiceRewardConfig/batchUpdate', [\app\dice\controller\reward_config\DiceRewardConfigController::class, 'batchUpdate']);
Route::post('/dice/reward_config/DiceRewardConfig/createRewardReference', [\app\dice\controller\reward_config\DiceRewardConfigController::class, 'createRewardReference']); Route::post('/dice/reward_config/DiceRewardConfig/createRewardReference', [\app\dice\controller\reward_config\DiceRewardConfigController::class, 'createRewardReference']);
Route::post('/dice/reward_config/DiceRewardConfig/runWeightTest', [\app\dice\controller\reward_config\DiceRewardConfigController::class, 'runWeightTest']); Route::post('/dice/reward_config/DiceRewardConfig/runWeightTest', [\app\dice\controller\reward_config\DiceRewardConfigController::class, 'runWeightTest']);
fastRoute('dice/ante_config/DiceAnteConfig', \app\dice\controller\ante_config\DiceAnteConfigController::class);
fastRoute('dice/lottery_pool_config/DiceLotteryPoolConfig', \app\dice\controller\lottery_pool_config\DiceLotteryPoolConfigController::class); fastRoute('dice/lottery_pool_config/DiceLotteryPoolConfig', \app\dice\controller\lottery_pool_config\DiceLotteryPoolConfigController::class);
Route::get('/dice/lottery_pool_config/DiceLotteryPoolConfig/getOptions', [\app\dice\controller\lottery_pool_config\DiceLotteryPoolConfigController::class, 'getOptions']); Route::get('/dice/lottery_pool_config/DiceLotteryPoolConfig/getOptions', [\app\dice\controller\lottery_pool_config\DiceLotteryPoolConfigController::class, 'getOptions']);
Route::get('/dice/lottery_pool_config/DiceLotteryPoolConfig/getCurrentPool', [\app\dice\controller\lottery_pool_config\DiceLotteryPoolConfigController::class, 'getCurrentPool']); Route::get('/dice/lottery_pool_config/DiceLotteryPoolConfig/getCurrentPool', [\app\dice\controller\lottery_pool_config\DiceLotteryPoolConfigController::class, 'getCurrentPool']);

View File

@@ -20,8 +20,13 @@ class Task
$dbName = env('DB_NAME'); $dbName = env('DB_NAME');
if (!empty($dbName)) { if (!empty($dbName)) {
$this->logic = new CrontabLogic(); $this->logic = new CrontabLogic();
$channelHost = env('WEBMAN_CHANNEL_HOST', '127.0.0.1');
$channelPort = filter_var(env('WEBMAN_CHANNEL_PORT'), FILTER_VALIDATE_INT);
if ($channelPort === false) {
$channelPort = 2207;
}
// 连接webman channel服务 // 连接webman channel服务
Client::connect(); Client::connect($channelHost, $channelPort);
// 订阅某个自定义事件并注册回调,收到事件后会自动触发此回调 // 订阅某个自定义事件并注册回调,收到事件后会自动触发此回调
Client::on('crontab', function ($data) { Client::on('crontab', function ($data) {
$this->reload($data); $this->reload($data);

View File

@@ -12,3 +12,5 @@ Route::group('/tool/install', function () {
Route::get('/online/storeAppVersions', [plugin\saipackage\app\controller\InstallController::class, 'storeAppVersions']); Route::get('/online/storeAppVersions', [plugin\saipackage\app\controller\InstallController::class, 'storeAppVersions']);
Route::post('/online/storeDownloadApp', [plugin\saipackage\app\controller\InstallController::class, 'storeDownloadApp']); Route::post('/online/storeDownloadApp', [plugin\saipackage\app\controller\InstallController::class, 'storeDownloadApp']);
}); });
Route::disableDefaultRoute('saipackage');