105 lines
148 KiB
JSON
105 lines
148 KiB
JSON
{"role":"user","message":{"content":[{"type":"text","text":"<user_query>\n请阅读 doc/@doc/wallet.md 文件，并整理为标准格式\n</user_query>"}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"正在读取 `doc/wallet.md` 的完整内容以了解结构并整理为标准格式。\n\n[REDACTED]"},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","limit":200}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","offset":200,"limit":400}},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","offset":600,"limit":400}},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","offset":1000,"limit":400}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"正在读取文件中可能遗漏的片段，随后将全文整理为层级清晰的 Markdown 标准结构。\n\n[REDACTED]"},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","offset":590,"limit":30}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Shell","input":{"command":"wc -c /Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md && wc -l /Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","description":"Count bytes and lines of wallet.md"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"正在将全文重组为规范 Markdown：统一标题层级、目录、列表与表格，并将 SQL 附录独立编号。\n\n[REDACTED]"},{"type":"tool_use","name":"Shell","input":{"command":"python3 << 'PYEOF'\nfrom pathlib import Path\n\nout = Path(\"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md\")\n\ncontent = r'''# 钱包提现与解锁规则 PRD\n\n| 项目 | 说明 |\n| --- | --- |\n| 文档类型 | 产品需求 / 业务规则（PRD） |\n| 适用场景 | 美国市场移动端 Slots 大厅：统一钱包、解锁、奖励转化与提现 |\n| 读者 | 产品、研发、风控、运营、测试 |\n\n---\n\n## 目录\n\n- [1. 文档目标](#1-文档目标)\n- [2. 适用范围](#2-适用范围)\n- [3. 核心设计原则](#3-核心设计原则)\n- [4. 钱包余额结构](#4-钱包余额结构)\n- [5. 现有钱包表字段建议](#5-现有钱包表字段建议)\n- [6. 资金 Lot 设计](#6-资金-lot-设计)\n- [7. 任务体系](#7-任务体系)\n- [8. 提现规则](#8-提现规则)\n- [9. 下注资金消耗顺序](#9-下注资金消耗顺序)\n- [10. 一次下注消耗多笔 Bonus 的规则](#10-一次下注消耗多笔-bonus-的规则)\n- [11. 一次下注混合消耗 Bonus、Deposit、Withdrawable](#11-一次下注混合消耗-bonusdepositwithdrawable)\n- [12. Slots 多次派奖与最终结算规则](#12-slots-多次派奖与最终结算规则)\n- [13. Bonus 转 Withdrawable 规则](#13-bonus-转-withdrawable-规则)\n- [14. Bonus 用完但未完成任务](#14-bonus-用完但未完成任务)\n- [15. Bonus 取消规则](#15-bonus-取消规则)\n- [16. 金额精度与舍入规则](#16-金额精度与舍入规则)\n- [17. 钱包流水规则](#17-钱包流水规则)\n- [18. 核心数据模型建议](#18-核心数据模型建议)\n- [19. 状态定义](#19-状态定义)\n- [20. 典型流程](#20-典型流程)\n- [21. 前端展示建议](#21-前端展示建议)\n- [22. 后台配置项](#22-后台配置项)\n- [23. 风控规则](#23-风控规则)\n- [24. 最终核心规则总结](#24-最终核心规则总结)\n- [25. 一句话产品原则](#25-一句话产品原则)\n- [附录 A. DDL（表结构 SQL）](#附录-a-ddl表结构-sql)\n\n---\n\n## 1. 文档目标\n\n建立一套适用于美国市场移动端 Slots 大厅的统一钱包、解锁、奖励转化与提现规则，确保：\n\n- 用户始终清楚知道「现在能提多少钱」\n- 用户能够理解为什么某些资金不能提现\n- 可提现余额不被新充值、新奖励、新任务回锁\n- Bonus 与 Deposit 任务边界清晰，不互相补进度\n- 下注、派奖、任务推进、资金转化全链路可追踪、可审计\n- 支持 Slots 游戏一次下注、多次派奖、多资金来源混合消耗等复杂结算场景\n\n---\n\n## 2. 适用范围\n\n本规则适用于以下业务场景：\n\n- 用户充值\n- 平台奖励发放\n- Bonus 领取\n- Slots 游戏下注\n- Slots 游戏多次派奖\n- Deposit 解锁任务\n- Bonus 转化任务\n- 提现申请、提现审核\n- 风控冻结\n- 用户取消 Bonus\n- 后台冲正 / 回滚\n\n---\n\n## 3. 核心设计原则\n\n### 3.1 用户原则\n\n- 用户应始终清楚知道：现在最多可以提现多少钱。\n- 用户应清楚知道：哪些金额是现金，哪些金额只是奖励额度。\n- 用户应能理解：为什么 Bonus Credits 当前不能提现。\n- 用户应能感受到：系统优先保护可提现余额。\n- 用户不应因为领取新 Bonus 或新充值，导致原本可提现的钱被重新锁定。\n\n### 3.2 系统原则\n\n- 提现只依赖 Withdrawable Balance。\n- 进入 Withdrawable Balance 的金额，不因新充值、新奖励、新任务回锁。\n- Deposit Unlock Task 与 Bonus Conversion Task 独立计算。\n- Deposit 下注只推进 Deposit 任务。\n- Bonus 下注只推进对应 Bonus 任务。\n- Withdrawable 下注不推进任何 Deposit / Bonus 任务。\n- 一次下注若消耗多个资金来源，必须按资金 Lot 拆分。\n- Slots 多次派奖必须以 Round 最终结算为准。\n- Bonus 是否转为 Withdrawable，不看单次派奖事件，而看整个 Round 最终结算后的 Lot 当前剩余金额。\n- 钱包展示是聚合余额，真实记账以资金 Lot 和流水为准。\n\n---\n\n## 4. 钱包余额结构\n\n钱包账户对外展示为四类核心余额：\n\n```text\nWallet\n├── Withdrawable Balance\n├── Locked Deposit Balance\n├── Bonus Credits\n└── Pending Withdrawal Balance\n```\n\n### 4.1 Withdrawable Balance\n\n**定义**：用户当前可以直接申请提现的金额。\n\n**来源**：\n\n- 已完成解锁的充值金额\n- 已完成转化的 Bonus 剩余金额\n- 使用 Withdrawable Balance 下注后产生的派奖\n- 其他明确归属为可提现的活动返奖\n\n**用户文案**：\n\n| 语言 | 文案 |\n| --- | --- |\n| 英文 | Available to withdraw now |\n| 中文 | 现在可提现 |\n\n**规则**：\n\n- 用户提现金额必须小于等于 Withdrawable Balance。\n- 已进入 Withdrawable Balance 的资金不会因新任务被重新锁定。\n- 新充值、新奖励、新 Bonus 不得影响已有的 Withdrawable Balance。\n\n### 4.2 Locked Deposit Balance\n\n**定义**：用户已充值到账，但尚未完成解锁条件，因此暂时不能提现的充值资金。\n\n**来源**：\n\n- 未完成解锁任务的充值金额\n- 充值资金产生的、仍归属于 Deposit Lot 的派奖\n\n**用户文案**：\n\n| 语言 | 文案 |\n| --- | --- |\n| 英文 | Deposit funds waiting to be unlocked |\n| 中文 | 充值资金待解锁 |\n\n**规则**：\n\n- Locked Deposit 可以用于下注。\n- 使用 Locked Deposit 下注后，推进对应 Deposit Unlock Task。\n- Deposit Task 完成后，该 Deposit Lot **当前剩余金额**转入 Withdrawable Balance。\n- Deposit Task 不过期。\n\n### 4.3 Bonus Credits\n\n**定义**：平台赠送的奖励额度，可用于游戏，但不可直接提现。\n\n**推荐前端命名**：\n\n- **不建议**：`Bonus Balance`\n- **建议**：Bonus Credits / Promotional Credits / Play Bonus\n\n**来源**：注册奖励、首充奖励、充值奖励、活动奖励、邀请奖励、VIP 输返、红包、签到奖励及其他奖励。\n\n**用户文案**：\n\n| 语言 | 文案 |\n| --- | --- |\n| 英文 | Bonus credits for play only |\n| 中文 | 奖励额度，仅可用于游戏 |\n\n**规则**：\n\n- Bonus Credits 可用于下注；不可直接提现。\n- Bonus Credits 完成转化任务后，**当前剩余金额**转入 Withdrawable Balance。\n- Bonus Conversion Task 默认不过期。\n- Bonus 用完但未完成转化任务时，状态变为 Played Out / Not Converted。\n\n### 4.4 Pending Withdrawal Balance\n\n**定义**：提现申请审核中的冻结金额。\n\n**来源**：用户提交提现申请后，从 Withdrawable Balance 转入。\n\n**用户文案**：\n\n| 语言 | 文案 |\n| --- | --- |\n| 英文 | Withdrawal request under review |\n| 中文 | 提现申请审核中 |\n\n**规则**：\n\n| 时点 | Withdrawable Balance | Pending Withdrawal Balance |\n| --- | --- | --- |\n| 提现申请 | 减少 | 增加 |\n| 提现成功（出账） | — | 减少，资金出账 |\n| 提现失败 / 用户取消 / 风控拒绝 | 增加 | 减少 |\n\n---\n\n## 5. 现有钱包表字段建议\n\n聚合钱包表可作为「钱包聚合账户表」使用。\n\n### 5.1 当前字段与业务含义\n\n| 字段 | 建议含义 |\n| --- | --- |\n| `deposit_balance` | Locked Deposit Balance，锁定充值余额 |\n| `withdraw_balance` | Withdrawable Balance，可提现余额 |\n| `frozen_bonus` | Bonus Credits，奖励额度 |\n| `available_bonus` | 待领取奖励（不建议放在钱包主账户） |\n| `bet_locked_balance` | 下注冻结余额，用于多阶段结算预留 |\n| `withdraw_lock` | Pending Withdrawal Balance，提现冻结余额 |\n| `status` | 钱包状态 |\n| `version` | 乐观锁版本号 |\n\n### 5.2 建议调整\n\n**`deposit_balance`**\n\n- 原注释示例：`deposit金额`\n- **建议**：锁定充值余额，未完成解锁前不能提现\n\n**`frozen_bonus`**\n\n- 原注释示例：冻结奖励池（bonus余额）\n- **建议**：业务命名可改为 `bonus_balance`；若暂不改字段名，注释改为：奖励额度，可用于下注，不可直接提现\n\n**`available_bonus`**\n\n不建议放在钱包主表；更像奖励中心「待领取奖励」，尚未真正进入钱包。推荐迁至：`reward_grant` / `reward_claimable` / `promotion_reward` 等。用户领取后才进入 Bonus Credits，并创建 Bonus Lot。\n\n---\n\n## 6. 资金 Lot 设计\n\n### 6.1 为什么需要 Lot\n\n钱包表只能记录用户总余额，无法单独回答：\n\n- 这笔 Bonus 是哪次活动发的？\n- 当前 Bonus 任务完成了多少？\n- 一次下注消耗了哪几笔 Bonus？\n- 一次派奖应该回到哪一笔 Bonus？\n- 哪笔充值完成了解锁？\n- 用户投诉时如何审计？\n\n因此必须引入资金 Lot。\n\n### 6.2 Lot 定义\n\n- Lot 是资金归属的最小单位。\n- 每一笔充值生成一个 Deposit Lot。\n- 每一笔奖励领取生成一个 Bonus Lot。\n\n### 6.3 Deposit Lot\n\n每笔充值生成一条独立的 Deposit Lot。\n\n**示例（用户充值 $100，要求 1 倍解锁）**：\n\n| 字段 | 值 |\n| --- | --- |\n| `lot_type` | Deposit |\n| `original_amount` | $100 |\n| `remaining_amount` | $100 |\n| `required_wager` | $100 |\n| `current_wager` | $0 |\n| `status` | Active |\n| `expires_at` | NULL |\n\n**完成后**：若当前 Deposit Lot 剩余 $80，任务完成后：`Locked Deposit Balance -$80`，`Withdrawable Balance +$80`；Lot `remaining_amount = 0`，`status = Completed`。\n\n> **注意**：释放的是该 Lot **当前剩余金额**，不是原始充值金额。\n\n### 6.4 Bonus Lot\n\n每笔奖励领取后生成一条独立的 Bonus Lot。\n\n**示例（用户领取 $50 首充奖励，要求 20 倍转化）**：\n\n| 字段 | 值 |\n| --- | --- |\n| `lot_type` | Bonus |\n| `original_amount` | $50 |\n| `remaining_amount` | $50 |\n| `required_wager` | $1,000 |\n| `current_wager` | $0 |\n| `status` | Active |\n| `expires_at` | NULL |\n\n**完成后**：若 Bonus Lot 当前剩余 $180，`Bonus Credits -$180`，`Withdrawable Balance +$180`；Lot `remaining_amount = 0`，`status = Completed`。\n\n> **注意**：转化的是 Bonus Lot **当前剩余金额**，不是原始 Bonus 金额。\n\n---\n\n## 7. 任务体系\n\n### 7.1 Deposit Unlock Task\n\n**定义**：每笔充值生成一条独立的充值解锁任务。\n\n**作用**：\n\n- 记录该笔充值的解锁要求与有效投注进度\n- 完成后将该 Deposit Lot **当前剩余金额**转入 Withdrawable Balance\n\n**任务推进**：只有消耗对应 Locked Deposit Lot 产生的有效投注，才推进该 Deposit Task。\n\n**任务顺序**：按充值顺序，`created_at ASC, id ASC`；当前 Deposit Task 未完成前，不推进后续。\n\n**任务有效期**：Deposit Unlock Task 不过期。\n\n**状态**：\n\n| 状态 | 含义 |\n| --- | --- |\n| Active | 进行中 |\n| PendingConversion | 流水已达成，等待相关 Round 最终结算 |\n| Completed | 已完成 |\n| Cancelled | 已取消 |\n| Reversed | 已冲正 |\n\n### 7.2 Bonus Conversion Task\n\n**定义**：每笔 Bonus 领取后生成一条独立的 Bonus 转化任务。\n\n**作用**：\n\n- 记录该笔 Bonus 的转化要求与有效投注进度\n- 完成后将该 Bonus Lot **当前剩余金额**转入 Withdrawable Balance\n\n**任务推进**：只有该 Bonus Lot 自己出资产生的有效投注，才推进该 Bonus Task。不同 Bonus Lot 之间：不共享进度、不互相补进度、不合并转化。\n\n**任务有效期**：Bonus Conversion Task **默认不过期**。\n\n**用户文案**：\n\n- 英文：Your bonus does not expire. Complete the playthrough requirement anytime to convert it to withdrawable cash.\n- 中文：奖励不会过期。你可以随时完成流水要求，将其转为可提现余额。\n\n**状态**：\n\n| 状态 | 含义 |\n| --- | --- |\n| Active | 进行中 |\n| PendingConversion | 流水已达成，等待 Round 最终结算 |\n| Completed | 已完成并转入可提现 |\n| PlayedOut | Bonus 已用完但未完成转化 |\n| Cancelled | 用户主动取消 |\n| Reversed | 风控或后台冲正 |\n\n---\n\n## 8. 提现规则\n\n### 8.1 基础提现规则\n\n提现申请须同时满足：\n\n- 提现金额 ≤ Withdrawable Balance\n- Withdrawable Balance ≥ 最低提现金额\n- 钱包状态正常\n- 用户通过 KYC / AML / 风控审核\n\n### 8.2 最低提现金额\n\n后台可配置，例如：\n\n| 配置项 | 示例 |\n| --- | --- |\n| `min_withdraw_amount` | $20 / $30 / $50 |\n\n### 8.3 未完成任务是否影响提现\n\n**最终规则**：未完成任务不做**账户级**提现锁定。\n\n- 有未完成 Deposit Task：不影响已有 Withdrawable Balance 提现\n- 有未完成 Bonus Task：不影响已有 Withdrawable Balance 提现\n- 未完成任务只限制对应的 Locked Deposit / Bonus Credits\n- 提现只依赖 Withdrawable Balance\n\n**推荐文案**：\n\n- 英文：You can withdraw your Withdrawable Cash anytime. Bonus Credits must be converted before they can be withdrawn.\n- 中文：你可以随时提现可提现现金。奖励额度需完成转化条件后，才可转为可提现现金。\n\n### 8.4 提现稳定性规则\n\n进入 Withdrawable Balance 的金额**不因**以下情况回锁：\n\n- 新充值、新奖励\n- 未完成 Bonus / Deposit 任务\n- 用户继续游戏\n\n**除非**发生：用户主动下注消耗、申请提现冻结、风控冻结、后台合法冲正、支付渠道退款/拒付处理等。\n\n---\n\n## 9. 下注资金消耗顺序\n\n**固定顺序**：`Bonus Credits → Locked Deposit → Withdrawable Balance`\n\n### 9.1 Bonus 优先\n\nBonus 属活动性资金，鼓励先玩；优先使用可减少误用现金。\n\n### 9.2 Locked Deposit 次之\n\n使用 Locked Deposit 下注可推进充值解锁，符合「继续玩即可解锁充值」的认知。\n\n### 9.3 Withdrawable 最后\n\n尽量保护可提现金额，增强安全感，契合「可提现余额优先保护」的目标。\n\n### 9.4 前端文案\n\n- 英文：We use bonus and locked funds first to help protect your withdrawable cash.\n- 中文：系统会优先使用奖励额度和锁定余额，尽可能保留你的可提现余额。\n\n---\n\n## 10. 一次下注消耗多笔 Bonus 的规则\n\n### 场景\n\n| Bonus Lot | 剩余金额 |\n| --- | --- |\n| Bonus A | $3 |\n| Bonus B | $20 |\n\n用户下注 `$10`，系统按 Bonus 消耗顺序拆分：\n\n| 来源 | 消耗金额 |\n| --- | --- |\n| Bonus A | $3 |\n| Bonus B | $7 |\n\n### 10.1 Bonus 消耗顺序\n\n默认不过期时，建议按领取时间 FIFO：`created_at ASC, id ASC`（最早领取的先消耗）。\n\n### 10.2 任务推进规则\n\n每个 Bonus Lot 只推进自己的任务。若有效投注系数为 100%，则 Bonus A `current_wager +$3`，Bonus B `current_wager +$7`；若为 20%，则为 `+$0.6` / `+$1.4`。\n\n### 10.3 派奖归属规则\n\n若下注最终派奖 $50，按出资比例拆分示例：\n\n| 来源 | 出资 | 比例 | 分配派奖 |\n| --- | --- | --- | --- |\n| Bonus A | $3 | 30% | $15 |\n| Bonus B | $7 | 70% | $35 |\n\n原则：**谁出资，谁推进任务；谁出资，谁获得对应派奖。**\n\n---\n\n## 11. 一次下注混合消耗 Bonus、Deposit、Withdrawable\n\n下注 $10 示例：\n\n| 来源 | 出资 |\n| --- | --- |\n| Bonus Lot A | $4 |\n| Deposit Lot B | $3 |\n| Withdrawable | $3 |\n\n若 Round 总派奖 $100：\n\n| 来源 | 出资比例 | 分配派奖 | 派奖归属 |\n| --- | --- | --- | --- |\n| Bonus Lot A | 40% | $40 | 回到 Bonus Lot A |\n| Deposit Lot B | 30% | $30 | 回到 Deposit Lot B |\n| Withdrawable | 30% | $30 | 回到 Withdrawable Balance |\n\n---\n\n## 12. Slots 多次派奖与最终结算规则\n\n### 12.1 背景\n\n一次下注可能产生多次派奖（线奖、Scatter、Free Spins、Bonus Feature、Jackpot、Feature Retrigger 等），故**不能**在单次派奖事件上即时做 Bonus→Withdrawable。\n\n### 12.2 核心规则\n\n- **结算单位**：游戏 Round——一笔下注、多次派奖事件、一次 Round Final Settlement。\n- Bonus→Withdrawable **只能**发生在 Round Final Settlement **之后**，不能在下注成功、首次派奖或任意中间派奖后立即发生。\n\n### 12.3 下注时处理\n\n- 扣减对应资金来源余额，记录资金来源拆分，推进对应 Lot 的 `current_wager`\n- **不执行** Bonus 转 Withdrawable、**不执行** PlayedOut 终态判断\n\n### 12.4 多次派奖时处理\n\n每次派奖：写 Round Event、累加 Round `payout_amount`；不立即回流 Lot，不转化 Bonus，不判断 PlayedOut。\n\n### 12.5 Final Settlement 时处理\n\n收到 Round Closed / Final Settlement 后：\n\n1. 读取总下注、总派奖、funding 明细 \n2. 按出资比例分配总派奖，回流 Bonus Lot / Deposit Lot / Withdrawable \n3. 判断 Deposit / Bonus 任务是否完成；对满足的 Bonus Lot 执行转 Withdrawable \n4. 余额为 0 且任务未完成的 Bonus Lot 判断 PlayedOut \n5. Round 标记 FinalSettled \n\n### 12.6 Free Spins / Bonus Feature 归属\n\n派奖继承触发 Feature 的**原始下注**资金来源。\n\n示例（原下注 $1 全额来自 Bonus Lot A）：Free Spins 最终赢 $100 → 全额回 Bonus Lot A。\n\n若原下注为混合出资 $0.4（Bonus Lot A）+ $0.6（Withdrawable），Free Spins 赢 $100：\n\n| 来源 | 分配派奖 |\n| --- | --- |\n| Bonus Lot A | $40 |\n| Withdrawable | $60 |\n\n---\n\n## 13. Bonus 转 Withdrawable 规则\n\n### 13.1 什么时候可以转\n\n须**同时**满足：\n\n- `current_wager >= required_wager`\n- 该 Bonus Lot 关联的所有 Round 已最终结算\n- `remaining_amount > 0`\n- `status` 为 Active 或 PendingConversion\n\n### 13.2 转化金额\n\n为 **Bonus Lot 当前 `remaining_amount`**，不是原始 Bonus 金额。\n\n### 13.3 转化处理\n\n示例（当前剩余 $180）：`Bonus Credits -$180`，`Withdrawable Balance +$180`；Lot `remaining_amount = 0`，`status = Completed`。流水示例：`biz_type = BONUS_CONVERTED`，`lot_id` 指向该 Bonus Lot，余额类型从 Bonus 减、向 Withdrawable 增。\n\n---\n\n## 14. Bonus 用完但未完成任务\n\n### 14.1 不能太早判断 PlayedOut\n\n不能在下注扣完 Bonus 后立刻因 `remaining_amount = 0` 且任务未完成而标 PlayedOut（Round 后续仍可能有派奖）。\n\n### 14.2 正确判断条件\n\n仅当同时满足：`remaining_amount = 0`、`current_wager < required_wager`、无关联未结算 Round、`status = Active` → `status = PlayedOut`。\n\n**用户文案**：\n\n- 英文：This bonus has been fully used and was not converted.\n- 中文：该奖励已使用完，未完成转化。\n\n---\n\n## 15. Bonus 取消规则\n\n### 15.1 用户主动取消\n\n**适用场景**：不想继续用 Bonus、清理任务、只关注 Withdrawable Cash 等。\n\n**影响**：`remaining_amount` 清零，Bonus Credits 扣减，`status = Cancelled`；**不影响** Withdrawable / Locked Deposit / Pending Withdrawal。\n\n**确认文案**：\n\n- 英文：Canceling this bonus will remove the remaining bonus credits. This will not affect your withdrawable cash.\n- 中文：取消该奖励将使剩余奖励额度失效，但不会影响你的可提现现金。\n\n### 15.2 风控 / 后台冲正\n\n`status = Reversed`，扣减 Bonus Credits，写钱包流水，记录操作人与原因。\n\n---\n\n## 16. 金额精度与舍入规则\n\n### 16.1 金额单位\n\n金额以最小单位整数存储（如 $1.00 → `100`，或按 TGO 等单位规则）。\n\n### 16.2 派奖按比例拆分余数\n\n- 先按比例向下取整，再计算差额 \n- 差额按出资金额**最大**的资金来源优先补齐；若相同则按 `funding id ASC` \n\n保证：**所有 funding 分配派奖之和 = Round 总派奖金额**。\n\n---\n\n## 17. 钱包流水规则\n\n所有钱包余额变化必须写流水。\n\n**必须写流水的场景**：充值到账、Bonus 领取、下注扣款、Round 最终派奖、Deposit 解锁、Bonus 转化、Bonus 取消、PlayedOut、提现冻结、提现成功、提现失败退回、后台冲正、风控冻结/解冻等。\n\n**原则**：\n\n- 每次变动有 before / after\n- 有业务 ID 与幂等 ID\n- Lot 相关记录 `lot_id`；Round 相关记录 `round_id`；提现相关记录 `withdraw_order_id`\n\n---\n\n## 18. 核心数据模型建议\n\n### 18.1 `wallet_account_01`\n\n用户钱包聚合余额快照。\n\n| 字段 | 说明 |\n| --- | --- |\n| `uid` | 用户 ID |\n| `currency` | 币种 |\n| `deposit_balance` | Locked Deposit Balance |\n| `withdraw_balance` | Withdrawable Balance |\n| `bonus_balance` / `frozen_bonus` | Bonus Credits |\n| `bet_locked_balance` | 下注冻结余额 |\n| `withdraw_lock` | 提现冻结余额 |\n| `status` | 钱包状态 |\n| `version` | 乐观锁版本 |\n\n### 18.2 `wallet_fund_lot_01`\n\n每笔充值 / 奖励的独立资金归属、余额和任务进度。\n\n| 字段 | 说明 |\n| --- | --- |\n| `id` | Lot ID |\n| `uid` | 用户 ID |\n| `currency` | 币种 |\n| `lot_no` | Lot 编号 |\n| `lot_type` | 1=Deposit，2=Bonus |\n| `source_type` / `source_id` | 来源 |\n| `original_amount` / `remaining_amount` | 金额 |\n| `wager_multiplier` / `required_wager` / `current_wager` | 打码相关 |\n| `consume_priority_at` | 消耗优先时间 |\n| `expires_at` | 过期（默认 NULL） |\n| `status` / `completed_at` / `version` | 状态与并发 |\n\n### 18.3 `wallet_bet_funding_01`\n\n每笔下注的资金来源拆分。\n\n| 字段 | 说明 |\n| --- | --- |\n| `bet_id` | 下注订单 ID |\n| `round_id` | 游戏 Round ID |\n| `fund_type` | 1=Bonus，2=Deposit，3=Withdrawable |\n| `lot_id` | Lot ID（Withdrawable 可为 0） |\n| `bet_amount` / `valid_bet_amount` | 出资与有效投注 |\n| `allocated_payout_amount` | FinalSettle 后分配派奖 |\n| `status` | 状态 |\n\n### 18.4 `wallet_game_round_01`\n\nRound 总下注、总派奖与最终结算状态。\n\n| 字段 | 说明 |\n| --- | --- |\n| `uid` / `provider` / `game_code` / `round_id` | 局标识 |\n| `bet_amount` / `payout_amount` | 汇总 |\n| `status` | BetPlaced / Settling / FinalSettled / Cancelled / Reversed |\n| `settled_at` | 最终结算时间 |\n\n### 18.5 `wallet_game_round_event_01`\n\nRound 内事件（下注、派奖、取消、回滚、最终结算等）。\n\n| 字段 | 说明 |\n| --- | --- |\n| `provider` / `provider_txn_id` | 厂商与幂等 |\n| `round_id` | 局号 |\n| `event_type` | Bet / Payout / FinalSettle / Cancel / Rollback |\n| `amount` / `created_at` | 金额与时间 |\n\n### 18.6 `wallet_ledger_01`\n\n全量账变，用于审计与对账。\n\n| 字段 | 说明 |\n| --- | --- |\n| `uid` / `currency` / `biz_type` / `biz_id` | 主体与业务 |\n| `balance_type` | 余额类型 |\n| `lot_id` / `round_id` | 关联 |\n| `change_amount` / `before_amount` / `after_amount` | 变动 |\n| `request_id` / `created_at` | 幂等与时间 |\n\n### 18.7 `withdraw_order_01`\n\n提现订单。\n\n| 字段 | 说明 |\n| --- | --- |\n| `withdraw_order_id` | 提现单 ID |\n| `uid` / `currency` / `amount` | 用户与金额 |\n| `status` | Pending / Approved / Rejected / Paid / Cancelled |\n| `risk_status` | 风控状态 |\n| `created_at` / `approved_at` / `paid_at` | 时间线 |\n\n---\n\n## 19. 状态定义\n\n### 19.1 Wallet Status\n\n| 状态码 | 含义 |\n| --- | --- |\n| 1 | 正常 |\n| 2 | 风控冻结 |\n\n### 19.2 Fund Lot Status\n\n| 状态码 | 名称 | 含义 |\n| --- | --- | --- |\n| 1 | Active | 进行中 |\n| 2 | PendingConversion | 流水达成，等待 Round 最终结算 |\n| 3 | Completed | 已完成 |\n| 4 | PlayedOut | 已用完未完成转化 |\n| 5 | Cancelled | 用户取消 |\n| 6 | Reversed | 风控/后台冲正 |\n\n### 19.3 Round Status\n\n| 状态码 | 名称 | 含义 |\n| --- | --- | --- |\n| 1 | BetPlaced | 已下注 |\n| 2 | Settling | 结算中 |\n| 3 | FinalSettled | 最终结算完成 |\n| 4 | Cancelled | 已取消 |\n| 5 | Reversed | 已回滚 |\n\n### 19.4 Withdrawal Status\n\n| 状态码 | 名称 | 含义 |\n| --- | --- | --- |\n| 1 | Pending | 待审核 |\n| 2 | Approved | 审核通过 |\n| 3 | Rejected | 审核拒绝 |\n| 4 | Paid | 已打款 |\n| 5 | Cancelled | 用户取消 |\n\n---\n\n## 20. 典型流程\n\n### 20.1 用户充值（$100）\n\n1. 创建 Deposit Lot：`original_amount = remaining_amount = 100`，`required_wager = 100`，`current_wager = 0` \n2. `wallet_account.deposit_balance += 100` \n3. 写钱包流水 \n\n### 20.2 用户领取 Bonus（$50）\n\n1. 创建 Bonus Lot：`original_amount = remaining_amount = 50`，`required_wager = 1000`，`current_wager = 0`，`expires_at = NULL` \n2. `wallet_account.bonus_balance += 50` \n3. 写钱包流水 \n\n### 20.3 用户下注（$10）\n\n消耗顺序：`Bonus → Locked Deposit → Withdrawable`。若分摊为 Bonus Lot A `$4`、Deposit Lot B `$3`、Withdrawable `$3`：\n\n1. 扣减对应余额 \n2. 写 `wallet_bet_funding` \n3. 创建或更新 `wallet_game_round` \n4. 推进 Lot `current_wager` \n5. 写流水；**不**执行 Bonus 转化 \n\n### 20.4 Round 多次派奖\n\n事件示例：Base Win $15 + Free Spins $40 + Bonus Feature $20 → 每次写 `wallet_game_round_event`，累加 `payout_amount`；**不**分配派奖、不转化、不 PlayedOut 判断。\n\n### 20.5 Round 最终结算（总派奖 $75）\n\n出资：Bonus A `$4`(40%)、Deposit B `$3`(30%)、Withdrawable `$3`(30%) → 派奖拆分示例：$30 / $22.5 / $22.5。处理：回流各 Lot/Balance → 校验任务 → 条件满足则转化 → `Round = FinalSettled`。\n\n### 20.6 Bonus 完成转化\n\n条件：`current_wager >= required_wager`，`remaining_amount = $30`，无未结算 Round → `bonus_balance -= 30`，`withdraw_balance += 30`，Lot Completed，写流水。\n\n### 20.7 Bonus PlayedOut\n\n`remaining_amount = 0` 且 `current_wager < required_wager` 且无未结算 Round → `PlayedOut`，不增加 `withdraw_balance`，写状态流水或任务日志。\n\n### 20.8 用户提现\n\n可提现 $100、申请 $50：`withdraw_balance -= 50`，`withdraw_lock += 50`，创建 `withdraw_order`，写流水。打款成功：`withdraw_lock -= 50`，`Paid`。失败：`withdraw_lock -= 50`，`withdraw_balance += 50`，`Rejected`。\n\n---\n\n## 21. 前端展示建议\n\n### 21.1 钱包首页\n\n| 模块 | 示例 |\n| --- | --- |\n| Withdrawable Cash | $120.00 — Available to withdraw now |\n| Locked Deposit | $50.00 — Play to unlock |\n| Bonus Credits | $30.00 — Play only · Convert by completing playthrough |\n| Pending Withdrawal | $100.00 — Withdrawal request under review |\n\n### 21.2 Bonus 任务页\n\n- 奖励额度 $30.00；流水进度 $120 / $300 \n- 英文：Your bonus does not expire. Complete the requirement to convert remaining Bonus Credits to Withdrawable Cash. \n- 中文：奖励不会过期。完成流水要求后，剩余奖励额度将转为可提现余额。 \n\n### 21.3 提现页\n\n- Available to withdraw now $120.00 \n- Bonus Credits and Locked Deposit are not withdrawable yet. \n- 中文：现在可提现 $120.00；奖励额度与锁定充值暂不可提现。 \n\n### 21.4 其他状态文案\n\n| 场景 | 英文 | 中文 |\n| --- | --- | --- |\n| 任务完成待 Round 结算 | Playthrough completed. Waiting for game round settlement. | 流水已完成，等待游戏局结算完成。 |\n| Bonus 用完未转化 | This bonus has been fully used and was not converted. | 该奖励已使用完，未完成转化。 |\n\n---\n\n## 22. 后台配置项\n\n| 配置项 | 说明 |\n| --- | --- |\n| `min_withdraw_amount` | 最低提现金额 |\n| `deposit_wager_multiplier` | 充值解锁倍数 |\n| `bonus_wager_multiplier` | Bonus 转化倍数 |\n| `bonus_no_expiry` | Bonus 是否不过期，默认 true |\n| `max_active_bonus_lot_count` | 最大 Active Bonus 数量 |\n| `game_wager_contribution_rate` | 游戏有效投注贡献比例 |\n| `bonus_cancel_enabled` | 是否允许用户取消 Bonus |\n| `withdraw_risk_review_enabled` | 是否开启提现风控审核 |\n\n---\n\n## 23. 风控规则\n\n**产品规则**：未完成任务不阻止 Withdrawable Balance 提现。\n\n**可限制提现的情形**（示例）：KYC 未通过、AML 命中、支付渠道风险、多账号、异常投注、退款/拒付、后台风控冻结等。\n\n风控限制须**独立于** Bonus / Deposit 任务系统。\n\n---\n\n## 24. 最终核心规则总结\n\n- 四类余额：Withdrawable、Locked Deposit、Bonus Credits、Pending Withdrawal \n- 提现只依赖 Withdrawable；未完成任务不做账户级提现锁 \n- 已进入 Withdrawable 的资金不因新任务回锁 \n- Deposit Task 不过期；Bonus Task 默认不过期 \n- Bonus 可玩不可直接提；转化后当前剩余入 Withdrawable；用完未完成任务为 PlayedOut \n- 一次下注可多来源，须按 Lot 拆分；派奖按出资比例回流 \n- Slots 以 Round Final Settlement 为准；Bonus 转化仅在最终结算后 \n- Free Spins / Feature 派奖继承原下注资金来源 \n- 全量账变写流水；任务与资金转化可追踪、可审计 \n\n---\n\n## 25. 一句话产品原则\n\n用户看到的余额是展示结果，系统真实记账以资金 Lot 为准；每一笔充值、奖励、下注、派奖、解锁、转化、提现均可追溯到具体资金来源。\n\n**用户侧表达**：\n\n- 英文：You can always withdraw your Withdrawable Cash. Bonus Credits are for play only and can be converted after completing the playthrough requirement. \n- 中文：你可以随时提现可提现现金。奖励额度仅可用于游戏，完成流水要求后可转为可提现余额。 \n\n---\n\n## 附录 A. DDL（表结构 SQL）\n\n以下为与本文规则配套的表结构草案（含注释中的章节编号为历史遗留，与创建顺序无关）。\n\n```sql\n-- =========================================================\n-- 1. 用户钱包账户聚合表\n-- 作用：只保存用户当前各类余额快照，不保存资金来源明细\n-- =========================================================\n\nCREATE TABLE `wallet_account_01`\n(\n `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',\n `uid` bigint unsigned NOT NULL COMMENT '用户ID',\n `currency` char(3) NOT NULL DEFAULT 'TGO' COMMENT '币种',\n\n `deposit_balance` bigint unsigned NOT NULL DEFAULT '0' COMMENT '锁定充值余额，未完成解锁前不可提现',\n `withdraw_balance` bigint unsigned NOT NULL DEFAULT '0' COMMENT '可提现余额，用户可申请提现的金额',\n `frozen_bonus` bigint unsigned NOT NULL DEFAULT '0' COMMENT '奖励额度 Bonus Credits，可用于下注，不可直接提现',\n `available_bonus` bigint unsigned NOT NULL DEFAULT '0' COMMENT '待领取奖励金额，建议后续迁移到 reward_grant 表',\n\n `bet_locked_balance` bigint unsigned NOT NULL DEFAULT '0' COMMENT '下注冻结余额，多阶段结算游戏预留',\n `withdraw_lock` bigint unsigned NOT NULL DEFAULT '0' COMMENT '提现冻结余额，提现审核中的金额',\n\n `status` tinyint unsigned NOT NULL DEFAULT '1' COMMENT '钱包状态：1=正常，2=风控冻结',\n `version` int unsigned NOT NULL DEFAULT '0' COMMENT '乐观锁版本号',\n\n `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',\n `updated_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',\n\n PRIMARY KEY (`id`),\n UNIQUE KEY `uk_uid_currency` (`uid`, `currency`),\n KEY `idx_status` (`status`)\n) ENGINE=InnoDB\n DEFAULT CHARSET=utf8mb4\n COLLATE=utf8mb4_0900_ai_ci\n COMMENT='用户钱包账户聚合表';\n\n-- =========================================================\n-- 3. 钱包资金 Lot 表\n-- 作用：记录每笔充值 / 每笔 Bonus 的独立资金归属、余额和打码进度\n-- Deposit Lot 和 Bonus Lot 都放这里\n-- =========================================================\n\nCREATE TABLE `wallet_fund_lot_01`\n(\n `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',\n `uid` bigint unsigned NOT NULL COMMENT '用户ID',\n `currency` char(3) NOT NULL DEFAULT 'TGO' COMMENT '币种',\n\n `lot_no` varchar(64) NOT NULL COMMENT '资金Lot编号',\n `lot_type` tinyint unsigned NOT NULL COMMENT '资金类型：1=Deposit锁定充值，2=Bonus奖励额度',\n\n `source_type` tinyint unsigned NOT NULL DEFAULT '0' COMMENT '来源类型：1=注册奖励,2=首充奖励,3=活动奖励,4=充值,5=签到奖励,6=红包,7=领取Bonus,8=VIP输返,9=后台发放',\n `source_id` varchar(128) NOT NULL DEFAULT '' COMMENT '来源业务ID，如充值订单ID、奖励发放ID',\n\n `original_amount` bigint unsigned NOT NULL DEFAULT '0' COMMENT '原始金额',\n `remaining_amount` bigint unsigned NOT NULL DEFAULT '0' COMMENT '当前剩余金额',\n\n `wager_multiplier` decimal(10, 2) NOT NULL DEFAULT '0.00' COMMENT '打码倍数',\n `required_wager` bigint unsigned NOT NULL DEFAULT '0' COMMENT '所需有效投注额',\n `current_wager` bigint unsigned NOT NULL DEFAULT '0' COMMENT '当前已完成有效投注额',\n\n `consume_priority_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '消耗优先时间，Bonus默认领取时间，Deposit默认充值时间',\n `expires_at` datetime DEFAULT NULL COMMENT '过期时间，NULL表示不过期',\n\n `status` tinyint unsigned NOT NULL DEFAULT '1' COMMENT '状态：1=Active,2=PendingConversion,3=Completed,4=PlayedOut,5=Cancelled,6=Reversed',\n `completed_at` datetime DEFAULT NULL COMMENT '完成时间',\n\n `brief` varchar(500) NOT NULL DEFAULT '' COMMENT '备注',\n `version` int unsigned NOT NULL DEFAULT '0' COMMENT '乐观锁版本号',\n\n `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',\n `updated_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',\n\n PRIMARY KEY (`id`),\n UNIQUE KEY `uk_lot_no` (`lot_no`),\n KEY `idx_uid_type_status_priority` (`uid`, `currency`, `lot_type`, `status`, `consume_priority_at`, `id`),\n KEY `idx_uid_status` (`uid`, `status`),\n KEY `idx_source` (`source_type`, `source_id`)\n) ENGINE=InnoDB\n DEFAULT CHARSET=utf8mb4\n COLLATE=utf8mb4_0900_ai_ci\n COMMENT='钱包资金Lot表，记录每笔充值和奖励的独立余额与打码进度';\n\n-- =========================================================\n-- 6. 下注资金拆分表\n-- 作用：记录一笔下注由哪些资金来源出资\n-- 支持一次下注消耗多笔 Bonus、多笔 Deposit、以及 Withdrawable\n-- FinalSettle 后按出资比例分配派奖\n-- =========================================================\n\nCREATE TABLE `wallet_bet_funding_01`\n(\n `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',\n `uid` bigint unsigned NOT NULL COMMENT '用户ID',\n `currency` char(3) NOT NULL DEFAULT 'TGO' COMMENT '币种',\n\n `provider` varchar(64) NOT NULL DEFAULT '' COMMENT '游戏厂商',\n `round_id` varchar(128) NOT NULL COMMENT '游戏局号',\n `bet_order_no` varchar(128) NOT NULL COMMENT '内部下注订单号',\n\n `fund_type` tinyint unsigned NOT NULL COMMENT '资金类型：1=Bonus，2=DepositLocked，3=Withdrawable',\n `lot_id` bigint unsigned NOT NULL DEFAULT '0' COMMENT '资金Lot ID，Withdrawable可为0',\n\n `bet_amount` bigint unsigned NOT NULL DEFAULT '0' COMMENT '本资金来源出资金额',\n `valid_bet_amount` bigint unsigned NOT NULL DEFAULT '0' COMMENT '计入任务的有效投注额',\n\n `allocated_payout_amount` bigint unsigned NOT NULL DEFAULT '0' COMMENT 'FinalSettle后分配到该资金来源的派奖金额',\n `is_final_allocated` tinyint unsigned NOT NULL DEFAULT '0' COMMENT '是否已完成最终派奖分配：0=否，1=是',\n\n `status` tinyint unsigned NOT NULL DEFAULT '1' COMMENT '状态：1=BetPlaced,2=FinalAllocated,3=Cancelled,4=Reversed',\n\n `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',\n `updated_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',\n\n PRIMARY KEY (`id`),\n KEY `idx_bet_order` (`bet_order_no`),\n KEY `idx_round` (`provider`, `round_id`),\n KEY `idx_uid_round` (`uid`, `provider`, `round_id`),\n KEY `idx_lot_status` (`lot_id`, `status`),\n KEY `idx_uid_status` (`uid`, `status`)\n) ENGINE=InnoDB\n DEFAULT CHARSET=utf8mb4\n COLLATE=utf8mb4_0900_ai_ci\n COMMENT='下注资金拆分表';\n\n-- =========================================================\n-- 2. 奖励发放 / 待领取奖励表\n-- 作用：承接原 available_bonus 的业务，不建议长期放在 wallet_account\n-- 用户领取后才进入 frozen_bonus，并创建 Bonus Lot\n-- =========================================================\n\nCREATE TABLE `reward_grant_01`\n(\n `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',\n `uid` bigint unsigned NOT NULL COMMENT '用户ID',\n `currency` char(3) NOT NULL DEFAULT 'TGO' COMMENT '币种',\n\n `reward_no` varchar(64) NOT NULL COMMENT '奖励发放编号',\n `source_type` tinyint unsigned NOT NULL DEFAULT '0' COMMENT '来源类型：1=注册奖励,2=首充奖励,3=活动奖励,4=签到奖励,5=红包,6=VIP输返,7=邀请奖励,8=后台发放',\n `source_id` varchar(128) NOT NULL DEFAULT '' COMMENT '来源业务ID',\n\n `reward_amount` bigint unsigned NOT NULL DEFAULT '0' COMMENT '奖励金额',\n `wager_multiplier` decimal(10, 2) NOT NULL DEFAULT '0.00' COMMENT '领取后生成 Bonus Lot 的打码倍数',\n `required_wager` bigint unsigned NOT NULL DEFAULT '0' COMMENT '领取后生成 Bonus Lot 的所需有效投注额',\n\n `status` tinyint unsigned NOT NULL DEFAULT '1' COMMENT '状态：1=待领取,2=已领取,3=已取消,4=已冲正',\n `claimed_at` datetime DEFAULT NULL COMMENT '领取时间',\n\n `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',\n `updated_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',\n\n PRIMARY KEY (`id`),\n UNIQUE KEY `uk_reward_no` (`reward_no`),\n KEY `idx_uid_status` (`uid`, `status`),\n KEY `idx_source` (`source_type`, `source_id`)\n) ENGINE=InnoDB\n DEFAULT CHARSET=utf8mb4\n COLLATE=utf8mb4_0900_ai_ci\n COMMENT='奖励发放与待领取奖励表';\n\n\nCREATE TABLE `wallet_log_01`\n(\n `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',\n `uid` bigint NOT NULL COMMENT '用户ID',\n `currency` char(5) NOT NULL COMMENT '币种',\n `wallet_type` tinyint NOT NULL COMMENT '钱包类型',\n `biz_type` varchar(32) NOT NULL COMMENT '业务类型：register|recharge|bet/win/refund/withdraw/adjust/withdraw_frozen/email|sign|bonus_to_deposit|lose_bonus|bet_bonus',\n `biz_id` varchar(64) NOT NULL COMMENT '业务唯一ID（幂等用）',\n `amount` bigint NOT NULL COMMENT '变动金额（正为增加，负为扣除）',\n `balance` bigint NOT NULL COMMENT '变动后余额（用于审计）',\n `remark` varchar(255) DEFAULT '' COMMENT '备注/附加信息（如gameId）',\n `trace_id` varchar(64) DEFAULT '' COMMENT '链路追踪ID（便于日志追查）',\n `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',\n PRIMARY KEY (`id`),\n UNIQUE KEY `uniq_uid_bizid_type` (`uid`,`biz_id`,`biz_type`),\n KEY `idx_uid_type` (`uid`,`biz_type`),\n KEY `idx_created` (`created_at`)\n) ENGINE=InnoDB AUTO_INCREMENT=496 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='钱包账变日志';\n```\n'''\n\nout.write_text(content, encoding='utf-8')\nprint('Wrote', out, 'lines', len(content.splitlines()), 'bytes', out.stat().st_size)\nPYEOF","description":"Write standardized wallet.md via Python"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"正在恢复第 20.5 节中原文的七步处理清单，避免在“标准格式”整理时丢失细节。\n\n[REDACTED]"},{"type":"tool_use","name":"StrReplace","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","old_string":"### 20.5 Round 最终结算（总派奖 $75）\n\n出资：Bonus A `$4`(40%)、Deposit B `$3`(30%)、Withdrawable `$3`(30%) → 派奖拆分示例：$30 / $22.5 / $22.5。处理：回流各 Lot/Balance → 校验任务 → 条件满足则转化 → `Round = FinalSettled`。","new_string":"### 20.5 Round 最终结算（总派奖 $75）\n\n**出资**：\n\n| 来源 | 金额 | 比例 |\n| --- | --- | --- |\n| Bonus Lot A | $4 | 40% |\n| Deposit Lot B | $3 | 30% |\n| Withdrawable | $3 | 30% |\n\n**分配派奖**：\n\n| 来源 | 分配派奖 |\n| --- | --- |\n| Bonus Lot A | $30 |\n| Deposit Lot B | $22.5 |\n| Withdrawable | $22.5 |\n\n**处理**：\n\n1. 回流 Bonus Lot A \n2. 回流 Deposit Lot B \n3. 增加 Withdrawable Balance \n4. 判断 Deposit Task 是否完成 \n5. 判断 Bonus Task 是否完成 \n6. 满足条件则转化 \n7. `Round status = FinalSettled` "}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Grep","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","pattern":"20\\.5 Round","-A":25}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","limit":30,"offset":800}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"limit":35,"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Grep","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","pattern":"### 10\\.2","-A":25}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"StrReplace","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","old_string":"### 20.6 Bonus 完成转化\n\n条件：`current_wager >= required_wager`，`remaining_amount = $30`，无未结算 Round → `bonus_balance -= 30`，`withdraw_balance += 30`，Lot Completed，写流水。\n\n### 20.7 Bonus PlayedOut\n\n`remaining_amount = 0` 且 `current_wager < required_wager` 且无未结算 Round → `PlayedOut`，不增加 `withdraw_balance`，写状态流水或任务日志。\n\n### 20.8 用户提现\n\n可提现 $100、申请 $50：`withdraw_balance -= 50`，`withdraw_lock += 50`，创建 `withdraw_order`，写流水。打款成功：`withdraw_lock -= 50`，`Paid`。失败：`withdraw_lock -= 50`，`withdraw_balance += 50`，`Rejected`。","new_string":"### 20.6 Bonus 完成转化\n\n**前提（Bonus Lot A）**：`current_wager >= required_wager`，`remaining_amount = $30`，无未结算 Round。\n\n**处理**：\n\n1. `bonus_balance -$30` \n2. `withdraw_balance +$30` \n3. Bonus Lot `remaining_amount = 0`，`status = Completed` \n4. 写钱包流水 \n\n### 20.7 Bonus PlayedOut\n\n**前提（Bonus Lot A）**：`remaining_amount = 0`，`current_wager < required_wager`，无未结算 Round。\n\n**处理**：\n\n1. Bonus Lot `status = PlayedOut` \n2. 不增加 `withdraw_balance` \n3. 写状态流水或任务日志 \n\n### 20.8 用户提现\n\n用户 Withdrawable Balance = $100，申请提现 $50。\n\n**提交申请**：\n\n1. `withdraw_balance -$50` \n2. `withdraw_lock +$50` \n3. 创建 `withdraw_order` \n4. 写钱包流水 \n\n**审核成功并打款**：\n\n1. `withdraw_lock -$50` \n2. `withdraw_order status = Paid` \n3. 写钱包流水 \n\n**审核失败**：\n\n1. `withdraw_lock -$50` \n2. `withdraw_balance +$50` \n3. `withdraw_order status = Rejected` \n4. 写钱包流水 "}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","offset":808,"limit":25}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"limit":35,"offset":830,"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"已读取并规范化仓库中的 **`/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md`**（路径 `doc/@doc/wallet.md` 一般等价于指向该文件）。整理方式如下：\n\n### 所做的「标准 Markdown / PRD」调整\n\n1. **标题层级**：顶层用 `#`，主章节 `## N.`，小节 `### N.x`，与原文 1–25 节对应。 \n2. **文档头部**：补充简要元信息表（文档类型、场景、读者），便于归档与检索。 \n3. **目录**：增加可跳转的章节目录（各渲染器的锚点可能略有差异；若某项无法跳转，以渲染器生成的 slug 为准）。 \n4. **列表**：目标、范围、原则等改为规范的 `-` 无序列表；流程步骤保留为有序列表。 \n5. **表格**：原先「字段 值」「两列横排」的说明改为 **Markdown 表格**（字段对照、配置项、状态枚举、双语文案等）。 \n6. **结构块**：钱包树状结构放进 ` ```text ` 代码块；DDL 归入 **`附录 A`**，标题改为「DDL（表结构 SQL）」，正文内说明 DDL 分段编号为历史写法、与执行顺序无关。 \n7. **分隔**：章节之间用 `---` 断开，版面更清晰。 \n\n### 内容与长度\n\n语义与边界条件与原版一致；**第 18 节数据模型**在表格中合并为「字段清单」写法（信息未删，仅占位更紧凑）。**第 20.5～20.8 节**保留为分步表格/编号列表形式，便于按流程实现与测试对照。\n\n如需把「附录 A」里 SQL 段落编号改成严格 1～6 连贯顺序或与 `18.x` 表名完全一致，可以说明期望的排序规则我再改一版。\n\n[REDACTED]"}]}}
|
||
{"role":"user","message":{"content":[{"type":"text","text":"<user_query>\nFund Lot Status 缺少一个等待状态 Waiting\n</user_query>"}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"正在查看文档中 Fund Lot Status 的定义及 SQL 注释，以添加 `Waiting` 状态并保持一致。\n\n[REDACTED]"},{"type":"tool_use","name":"Grep","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","pattern":"Fund Lot|fund_lot|PendingConversion|PlayedOut"}},{"type":"tool_use","name":"Grep","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet","pattern":"lot.*status|FundLot|fund_lot.*status","glob":"*.php"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","limit":35,"offset":718}},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/model/multi/WalletAccountModel.php","limit":80}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Grep","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet","pattern":"fund_lot|FundLot|lot_type.*status"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Grep","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","pattern":"### 7\\.1|Deposit Task 按充值"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"limit":70,"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","offset":300}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"在 **§19.2 Fund Lot Status** 与 DDL 中为 `Waiting` 新增枚举 **7**，并注明与 `PendingConversion`（流水达标等待 Round）的区别。\n\n[REDACTED]"},{"type":"tool_use","name":"StrReplace","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","old_string":"### 19.2 Fund Lot Status\n\n| 状态码 | 名称 | 含义 |\n|-----|-------------------|--------------------|\n| 1 | Active | 进行中 |\n| 2 | PendingConversion | 流水达成，等待 Round 最终结算 |\n| 3 | Completed | 已完成 |\n| 4 | PlayedOut | 已用完未完成转化 |\n| 5 | Cancelled | 用户取消 |\n| 6 | Reversed | 风控/后台冲正 |","new_string":"### 19.2 Fund Lot Status\n\n| 状态码 | 名称 | 含义 |\n|-----|-------------------|--------------------|\n| 1 | Active | 进行中 |\n| 2 | PendingConversion | 流水达成，等待 Round 最终结算 |\n| 3 | Completed | 已完成 |\n| 4 | PlayedOut | 已用完未完成转化 |\n| 5 | Cancelled | 用户取消 |\n| 6 | Reversed | 风控/后台冲正 |\n| 7 | Waiting | 等待轮到本 Lot 进入可下注/解锁流程（如前序 Deposit 未完成时排队）；不产生有效投注进度、不参与下注资金消耗 |\n\n与 `PendingConversion` 的区别：`PendingConversion` 是**流水门槛已达标**、等待该局 Round 最终结算；`Waiting` 是尚未进入可消耗/`Active` 阶段的**门禁/排队**状态。\n"}},{"type":"tool_use","name":"StrReplace","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","old_string":" `status` tinyint unsigned NOT NULL DEFAULT '1' COMMENT '状态：1=Active,2=PendingConversion,3=Completed,4=PlayedOut,5=Cancelled,6=Reversed',","new_string":" `status` tinyint unsigned NOT NULL DEFAULT '1' COMMENT '状态：1=Active,2=PendingConversion,3=Completed,4=PlayedOut,5=Cancelled,6=Reversed,7=Waiting',"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"在 §7.1 的「任务顺序」处补充一行，将与 `Waiting` 状态对齐。\n\n[REDACTED]"},{"type":"tool_use","name":"StrReplace","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","old_string":"**任务顺序**：按充值顺序，`created_at ASC, id ASC`；当前 Deposit Task 未完成前，不推进后续。\n\n**任务有效期**：Deposit Unlock Task 不过期。","new_string":"**任务顺序**：按充值顺序，`created_at ASC, id ASC`；当前 Deposit Task 未完成前，不推进后续。可按需将未到顺序的 Deposit Lot 置于 **Waiting**（见 §19.2）；转入 **Active** 后再参与下注消耗与打码累积。\n\n**任务有效期**：Deposit Unlock Task 不过期。"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"已按你的要求补上 **Fund Lot 的 `Waiting` 状态**，改动如下：\n\n### 1. `### 19.2 Fund Lot Status`\n- 增加状态码 **`7 | Waiting`**，含义概括为：尚未轮到本条 Lot 进入可下注/解锁（例如按笔排队的 Deposit 在前序未完成时排队）；**不参与下注消耗与有效投注累计**。\n- 增加一小段说明，区分 **`Waiting`**（门禁/排队）与 **`PendingConversion`**（流水已达标，等 Round 终局结算）。\n\n### 2. 附录 DDL `wallet_fund_lot_01.status`\n- 字段注释中补充 **`,7=Waiting`**，与上文枚举一致。\n\n### 3. `### 7.1 Deposit Unlock Task`\n- 在「任务顺序」下加了一句：可将未到顺序的 Deposit Lot 标为 **`Waiting`**，进入 **`Active`** 后再参与下注与打码，与 §19.2 互相引用。\n\n若你希望 **`Waiting` 使用别的数字**（例如希望插在 `1`/`2` 之间而整体重编码），可以说一下已定稿的枚举表，我再帮你改掉文档里的码值与 DDL 注释。\n\n[REDACTED]"}]}}
|
||
{"role":"user","message":{"content":[{"type":"text","text":"<user_query>\nwaiting应该是数字最小0吧，或者1\n</user_query>"}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"将 `Waiting` 设为枚举最小值：**0**。保留 `Active=1 … Reversed=6`，避免大范围重编码；默认值仍为 `Active(1)`。正在更新 `doc/wallet.md` 中的表格与 DDL 注释。\n\n[REDACTED]"},{"type":"tool_use","name":"Grep","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","pattern":"19\\.2 Fund Lot|Waiting|status.*tinyint.*fund_lot"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","limit":25,"offset":722}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"StrReplace","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","old_string":"### 19.2 Fund Lot Status\n\n| 状态码 | 名称 | 含义 |\n|-----|-------------------|--------------------|\n| 1 | Active | 进行中 |\n| 2 | PendingConversion | 流水达成，等待 Round 最终结算 |\n| 3 | Completed | 已完成 |\n| 4 | PlayedOut | 已用完未完成转化 |\n| 5 | Cancelled | 用户取消 |\n| 6 | Reversed | 风控/后台冲正 |\n| 7 | Waiting | 等待轮到本 Lot 进入可下注/解锁流程（如前序 Deposit 未完成时排队）；不产生有效投注进度、不参与下注资金消耗 |\n\n与 `PendingConversion` 的区别：`PendingConversion` 是**流水门槛已达标**、等待该局 Round 最终结算；`Waiting` 是尚未进入可消耗/`Active` 阶段的**门禁/排队**状态。","new_string":"### 19.2 Fund Lot Status\n\n`Waiting` 使用 **0**，与 **`Active`(1)** 区分开：0 为枚举最小码，便于排序与校验「未激活 / 排队中」早于「可消耗」。\n\n| 状态码 | 名称 | 含义 |\n| ------ | ------------------- | -------------------------------------------------------------------- |\n| 0 | Waiting | 等待轮到本 Lot 进入可下注/解锁流程（如前序 Deposit 未完成时排队）；不产生有效投注进度、不参与下注资金消耗 |\n| 1 | Active | 进行中 |\n| 2 | PendingConversion | 流水达成，等待 Round 最终结算 |\n| 3 | Completed | 已完成 |\n| 4 | PlayedOut | 已用完未完成转化 |\n| 5 | Cancelled | 用户取消 |\n| 6 | Reversed | 风控/后台冲正 |\n\nDDL 默认值保持 **`DEFAULT '1'`（Active）**；创建后需排队门禁的 Lot 显式设为 `0`。与 `PendingConversion` 的区别：`PendingConversion` 是**流水门槛已达标**、等待该局 Round 最终结算；`Waiting` 是尚未进入可消耗/`Active` 阶段的**门禁/排队**状态。"}},{"type":"tool_use","name":"StrReplace","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","old_string":" `status` tinyint unsigned NOT NULL DEFAULT '1' COMMENT '状态：1=Active,2=PendingConversion,3=Completed,4=PlayedOut,5=Cancelled,6=Reversed,7=Waiting',","new_string":" `status` tinyint unsigned NOT NULL DEFAULT '1' COMMENT '状态：0=Waiting,1=Active,2=PendingConversion,3=Completed,4=PlayedOut,5=Cancelled,6=Reversed',"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Grep","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet","pattern":"7=Waiting|Waiting.*7"}}]}}
|
||
{"role":"user","message":{"content":[{"type":"text","text":"<user_query>\n用1吧，这个表是新表，默认应该就是等待\n</user_query>"}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"将 Fund Lot 状态改为：`1 = Waiting`（默认值），并重排其余状态码（2–7）。正在更新 `doc/wallet.md` 中 §19.2、相关说明与 DDL。\n\n[REDACTED]"},{"type":"tool_use","name":"Grep","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","pattern":"Waiting|0=|DEFAULT '1'|fund_lot|19\\.2"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Grep","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","pattern":"status.*Active|Active.*status|Deposit Lot"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"limit":35,"offset":758,"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md"}},{"type":"tool_use","name":"Read","input":{"limit":25,"offset":718,"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"正在将枚举改为：**1 = Waiting（默认）、2–7** 顺延，并同步更新 DDL 默认值说明与充值/领奖示例中的一句状态说明。\n\n[REDACTED]"},{"type":"tool_use","name":"StrReplace","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","old_string":"### 19.2 Fund Lot Status\n\n`Waiting` 使用 **0**，与 **`Active`(1)** 区分开：0 为枚举最小码，便于排序与校验「未激活 / 排队中」早于「可消耗」。\n\n| 状态码 | 名称 | 含义 |\n| ------ | ------------------- | -------------------------------------------------------------------- |\n| 0 | Waiting | 等待轮到本 Lot 进入可下注/解锁流程（如前序 Deposit 未完成时排队）；不产生有效投注进度、不参与下注资金消耗 |\n| 1 | Active | 进行中 |\n| 2 | PendingConversion | 流水达成，等待 Round 最终结算 |\n| 3 | Completed | 已完成 |\n| 4 | PlayedOut | 已用完未完成转化 |\n| 5 | Cancelled | 用户取消 |\n| 6 | Reversed | 风控/后台冲正 |\n\nDDL 默认值保持 **`DEFAULT '1'`（Active）**；创建后需排队门禁的 Lot 显式设为 `0`。与 `PendingConversion` 的区别：`PendingConversion` 是**流水门槛已达标**、等待该局 Round 最终结算；`Waiting` 是尚未进入可消耗/`Active` 阶段的**门禁/排队**状态。","new_string":"### 19.2 Fund Lot Status\n\n本文为**新表**约定：`Waiting` 占 **`1`** 且 **`DEFAULT '1'`**，入库即排队/待门禁；获准参与下注消耗与进度累计时再置为 **`Active`(2)**。若业务上不要求排队，插入后应尽快更新为 **`Active`(2)**。\n\n| 状态码 | 名称 | 含义 |\n| ------ | ------------------- | -------------------------------------------------------------------- |\n| 1 | Waiting | 等待轮到本 Lot 进入可下注/解锁流程（如前序 Deposit 未完成时排队）；不产生有效投注进度、不参与下注资金消耗 |\n| 2 | Active | 进行中 |\n| 3 | PendingConversion | 流水达成，等待 Round 最终结算 |\n| 4 | Completed | 已完成 |\n| 5 | PlayedOut | 已用完未完成转化 |\n| 6 | Cancelled | 用户取消 |\n| 7 | Reversed | 风控/后台冲正 |\n\n与 `PendingConversion` 的区别：`PendingConversion`(3) 是**流水门槛已达标**、等待该局 Round 最终结算；`Waiting`(1) 是尚未获准进入 **`Active`(2)** 的门禁/排队状态。"}},{"type":"tool_use","name":"StrReplace","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","old_string":" `status` tinyint unsigned NOT NULL DEFAULT '1' COMMENT '状态：0=Waiting,1=Active,2=PendingConversion,3=Completed,4=PlayedOut,5=Cancelled,6=Reversed',","new_string":" `status` tinyint unsigned NOT NULL DEFAULT '1' COMMENT '状态：1=Waiting,2=Active,3=PendingConversion,4=Completed,5=PlayedOut,6=Cancelled,7=Reversed',"}},{"type":"tool_use","name":"StrReplace","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","old_string":"1. 创建 Deposit Lot：`original_amount = remaining_amount = 100`，`required_wager = 100`，`current_wager = 0`\n2. `wallet_account.deposit_balance += 100`","new_string":"1. 创建 Deposit Lot：`original_amount = remaining_amount = 100`，`required_wager = 100`，`current_wager = 0`；入库默认 **`status = Waiting`(1)**，若本条为当前队首/可立即按规则下注则改为 **`Active`(2)** \n2. `wallet_account.deposit_balance += 100`"}},{"type":"tool_use","name":"StrReplace","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","old_string":"1. 创建 Bonus Lot：`original_amount = remaining_amount = 50`，`required_wager = 1000`，`current_wager = 0`，`expires_at = NULL`","new_string":"1. 创建 Bonus Lot：`original_amount = remaining_amount = 50`，`required_wager = 1000`，`current_wager = 0`，`expires_at = NULL`；入库默认 **`status = Waiting`(1)**，若领取完成即可参与游戏则将 **`status` 置为 `Active`(2)** "}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","limit":35,"offset":718}},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","limit":35,"offset":998}},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","limit":25,"offset":762}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Grep","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","pattern":"§19\\.2|Waiting|PendingConversion|`status`","glob":"*.md"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Grep","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet","pattern":"0=Waiting|status = 0"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"limit":20,"offset":528,"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Grep","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","pattern":"status.*Active|Active 或 Pending"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Grep","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","pattern":"Completed|PlayedOut|status =","glob":"*.md"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"文档已采用 **`1 = Waiting`** 且 **`DEFAULT '1'`**；我们正微调 §7.1、§13.1、§14.2 中的状态码引用以与 §19.2 一致。\n\n[REDACTED]"},{"type":"tool_use","name":"StrReplace","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","old_string":"**任务顺序**：按充值顺序，`created_at ASC, id ASC`；当前 Deposit Task 未完成前，不推进后续。可按需将未到顺序的 Deposit Lot 置于 **Waiting**（见 §19.2）；转入 **Active** 后再参与下注消耗与打码累积。","new_string":"**任务顺序**：按充值顺序，`created_at ASC, id ASC`；当前 Deposit Task 未完成前，不推进后续。可按需将未到顺序的 Deposit Lot 置于 **`Waiting`(1)**（见 §19.2）；获准后再置为 **`Active`(2)** 参与下注消耗与打码累积。"}},{"type":"tool_use","name":"StrReplace","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","old_string":"- `status` 为 Active 或 PendingConversion","new_string":"- `status` 为 **Active(2)** 或 **PendingConversion(3)**"}},{"type":"tool_use","name":"StrReplace","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","old_string":"仅当同时满足：`remaining_amount = 0`、`current_wager < required_wager`、无关联未结算 Round、`status = Active` → `status = PlayedOut`。","new_string":"仅当同时满足：`remaining_amount = 0`、`current_wager < required_wager`、无关联未结算 Round、`status = Active`(2) → `status = PlayedOut`(5)。"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"已按你的约定固定为 **`Waiting = 1` 且表默认 `'1'`**。当前 `doc/wallet.md` 里与之一致的内容包括：\n\n### 枚举（Fund Lot，`wallet_fund_lot_01`）\n\n| 码 | 状态 |\n|---|---|\n| **1** | **Waiting（默认）** |\n| 2 | Active |\n| 3 | PendingConversion |\n| 4 | Completed |\n| 5 | PlayedOut |\n| 6 | Cancelled |\n| 7 | Reversed |\n\n- DDL：`DEFAULT '1'` + 注释 `'状态：1=Waiting,2=Active,…'`\n- §19.2：说明「新表、默认排队；可玩时再改为 Active(2)」\n- §20.1 / §20.2：创建 Lot 后为 **Waiting(1)**，队首或可立即游戏的再改为 **Active(2)**\n\n并已与 §13.1（转化条件 **2 / 3**）、§14.2（PlayedOut **5**）、§7.1 排队描述对齐。\n\nDeposit / Bonus **任务表**里的状态仍是**名称枚举**（未改数码），避免和 Fund Lot **状态码**混成一张表。若你希望任务表也完全按 1–7 对齐命名，可以再说明一下我一起改文案。\n\n[REDACTED]"}]}}
|
||
{"role":"user","message":{"content":[{"type":"text","text":"<user_query>\n对齐\n</user_query>"}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"正在阅读文档中任务状态与 Fund Lot 状态的相关章节，以对齐枚举与数值。\n\n[REDACTED]"},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","limit":90,"offset":300}},{"type":"tool_use","name":"Grep","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","pattern":"Active|PendingConversion|PlayedOut|Deposit Task|Bonus Task|任务.*状态"}}]}}
|
||
{"role":"user","message":{"content":[{"type":"text","text":"<user_query>\n19.2 Fund Lot Status 这里\n</user_query>"}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","offset":708,"limit":45}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"优化 **§19.2 Fund Lot Status**：统一表格风格（与 §19.1 一致）、精简说明，并注明 **PlayedOut 仅适用于 Bonus Lot**（Deposit Lot 不使用该状态码）。\n\n[REDACTED]"},{"type":"tool_use","name":"StrReplace","input":{"new_string":"### 19.2 Fund Lot Status\n\n与 `wallet_fund_lot_01.status` 一致：`DEFAULT '1'` 表示 **`Waiting`**；数值与名称严格对应下表。\n\n| 状态码 | 名称 | 含义 | 适用 |\n| --- | --- | --- | --- |\n| 1 | Waiting | 排队/待门禁：尚未获准进入可下注与打码累计（如前序 Deposit 未完成）；**不参与**下注资金消耗与任务进度 | Deposit / Bonus |\n| 2 | Active | 进行中：可参与消耗顺序、按规则推进对应任务 | Deposit / Bonus |\n| 3 | PendingConversion | 流水门槛已达标，等待本局 **Round 最终结算** 后再做转化/解锁落账（与 `Waiting` 不同：`Waiting` 是未轮到 playable，本状态是已达标等结算） | Deposit / Bonus |\n| 4 | Completed | 已完成（解锁/转化落账完毕，`remaining_amount` 已结清） | Deposit / Bonus |\n| 5 | PlayedOut | Bonus 已用完但未完成转化；**仅 Bonus Lot 使用，Deposit Lot 不应出现本码** | 仅 Bonus |\n| 6 | Cancelled | 用户取消（如主动取消 Bonus） | 主要 Bonus；Deposit 按业务 |\n| 7 | Reversed | 风控或后台冲正 | Deposit / Bonus |\n\n**约定**：无排队需求时，插入后应尽快将 `1` 更新为 `2`（`Active`），再参与游戏与任务。\n","old_string":"### 19.2 Fund Lot Status\n\n本文为**新表**约定：`Waiting` 占 **`1`** 且 **`DEFAULT '1'`**，入库即排队/待门禁；获准参与下注消耗与进度累计时再置为 **`Active`(2)**。若业务上不要求排队，插入后应尽快更新为 **`Active`(2)**。\n\n| 状态码 | 名称 | 含义 |\n| ------ | ------------------- | -------------------------------------------------------------------- |\n| 1 | Waiting | 等待轮到本 Lot 进入可下注/解锁流程（如前序 Deposit 未完成时排队）；不产生有效投注进度、不参与下注资金消耗 |\n| 2 | Active | 进行中 |\n| 3 | PendingConversion | 流水达成，等待 Round 最终结算 |\n| 4 | Completed | 已完成 |\n| 5 | PlayedOut | 已用完未完成转化 |\n| 6 | Cancelled | 用户取消 |\n| 7 | Reversed | 风控/后台冲正 |\n\n与 `PendingConversion` 的区别：`PendingConversion`(3) 是**流水门槛已达标**、等待该局 Round 最终结算；`Waiting`(1) 是尚未获准进入 **`Active`(2)** 的门禁/排队状态。\n\n","path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"已只在 **§19.2 Fund Lot Status** 做了整理，主要包括：\n\n1. **和表字段对齐**：写明与 `wallet_fund_lot_01.status`、`DEFAULT '1'` 一致。 \n2. **表格对齐 §19**：增加 **「适用」** 列，标明每个码用于 Deposit / Bonus 还是仅 Bonus。 \n3. **语义对齐**：在同一行里对照 **`Waiting`(1)** 与 **`PendingConversion`(3)**（未轮到 playable vs 流水已达标等 Round）。 \n4. **`PlayedOut`(5)**：写明 **仅限 Bonus Lot**，Deposit Lot 不应出现。 \n5. **尾部约定**：无排队时插入后尽快 `1 → 2`（Active），避免重复长段说明。\n\n若你希望 **Cancelled(6)** 也写成「仅 Bonus」、或去掉「适用」列只保留三列，可以再说一下我按你的口径改一版。\n\n[REDACTED]"}]}}
|
||
{"role":"user","message":{"content":[{"type":"text","text":"<user_query>\n参考commandInitDB.php 将 wallet_fund_lot_xx与wallet_bet_funding_xx 也初始化\n</user_query>"}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Glob","input":{"target_directory":"/Users/ray/Documents/project/www/ray/slot-wallet","glob_pattern":"**/commandInitDB.php"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Grep","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet","pattern":"InitDB|commandInit"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/command/InitDB.php"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","offset":958,"limit":120}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"在 `InitDB.php` 中新增与 `initWalletLog` 相同风格的初始化逻辑，并把这两张表加入 `createSql()` 的完整建表流程。\n\n[REDACTED]"},{"type":"tool_use","name":"StrReplace","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/command/InitDB.php","new_string":"\n /**\n * 钱包资金 Lot + 下注资金拆分表（shard 库wallet_xx、表后缀_xx）\n */\n protected function initWalletFundLotAndBetFunding()\n {\n $shardInfo = config('app.shard');\n for ($i = 1; $i <= $shardInfo['database_num']; $i++) {\n $db = sprintf(\"wallet_%02d\", $i);\n Db::execute(\"CREATE DATABASE IF NOT EXISTS `{$db}` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci\");\n Db::execute(\"use `{$db}` \");\n for ($j = 1; $j <= $shardInfo['table_num']; $j++) {\n $t = sprintf(\"%02d\", $j);\n\n $fundLotSql = \"CREATE TABLE `{$db}`.`wallet_fund_lot_{$t}` (\n `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',\n `uid` bigint unsigned NOT NULL COMMENT '用户ID',\n `currency` char(3) NOT NULL DEFAULT 'TGO' COMMENT '币种',\n\n `lot_no` varchar(64) NOT NULL COMMENT '资金Lot编号',\n `lot_type` tinyint unsigned NOT NULL COMMENT '资金类型：1=Deposit锁定充值，2=Bonus奖励额度',\n\n `source_type` tinyint unsigned NOT NULL DEFAULT '0' COMMENT '来源类型：1=注册奖励,2=首充奖励,3=活动奖励,4=充值,5=签到奖励,6=红包,7=领取Bonus,8=VIP输返,9=后台发放',\n `source_id` varchar(128) NOT NULL DEFAULT '' COMMENT '来源业务ID，如充值订单ID、奖励发放ID',\n\n `original_amount` bigint unsigned NOT NULL DEFAULT '0' COMMENT '原始金额',\n `remaining_amount` bigint unsigned NOT NULL DEFAULT '0' COMMENT '当前剩余金额',\n\n `wager_multiplier` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '打码倍数',\n `required_wager` bigint unsigned NOT NULL DEFAULT '0' COMMENT '所需有效投注额',\n `current_wager` bigint unsigned NOT NULL DEFAULT '0' COMMENT '当前已完成有效投注额',\n\n `consume_priority_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '消耗优先时间，Bonus默认领取时间，Deposit默认充值时间',\n `expires_at` datetime DEFAULT NULL COMMENT '过期时间，NULL表示不过期',\n\n `status` tinyint unsigned NOT NULL DEFAULT '1' COMMENT '状态：1=Waiting,2=Active,3=PendingConversion,4=Completed,5=PlayedOut,6=Cancelled,7=Reversed',\n `completed_at` datetime DEFAULT NULL COMMENT '完成时间',\n\n `brief` varchar(500) NOT NULL DEFAULT '' COMMENT '备注',\n `version` int unsigned NOT NULL DEFAULT '0' COMMENT '乐观锁版本号',\n\n `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',\n `updated_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',\n\n PRIMARY KEY (`id`),\n UNIQUE KEY `uk_lot_no` (`lot_no`),\n KEY `idx_uid_type_status_priority` (`uid`, `currency`, `lot_type`, `status`, `consume_priority_at`, `id`),\n KEY `idx_uid_status` (`uid`, `status`),\n KEY `idx_source` (`source_type`, `source_id`)\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='钱包资金Lot表，记录每笔充值和奖励的独立余额与打码进度'\";\n Db::execute($fundLotSql);\n echo \"CREATE TABLE `{$db}`.`wallet_fund_lot_{$t}` success\" . PHP_EOL;\n\n $betFundingSql = \"CREATE TABLE `{$db}`.`wallet_bet_funding_{$t}` (\n `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',\n `uid` bigint unsigned NOT NULL COMMENT '用户ID',\n `currency` char(3) NOT NULL DEFAULT 'TGO' COMMENT '币种',\n\n `provider` varchar(64) NOT NULL DEFAULT '' COMMENT '游戏厂商',\n `round_id` varchar(128) NOT NULL COMMENT '游戏局号',\n `bet_order_no` varchar(128) NOT NULL COMMENT '内部下注订单号',\n\n `fund_type` tinyint unsigned NOT NULL COMMENT '资金类型：1=Bonus，2=DepositLocked，3=Withdrawable',\n `lot_id` bigint unsigned NOT NULL DEFAULT '0' COMMENT '资金Lot ID，Withdrawable可为0',\n\n `bet_amount` bigint unsigned NOT NULL DEFAULT '0' COMMENT '本资金来源出资金额',\n `valid_bet_amount` bigint unsigned NOT NULL DEFAULT '0' COMMENT '计入任务的有效投注额',\n\n `allocated_payout_amount` bigint unsigned NOT NULL DEFAULT '0' COMMENT 'FinalSettle后分配到该资金来源的派奖金额',\n `is_final_allocated` tinyint unsigned NOT NULL DEFAULT '0' COMMENT '是否已完成最终派奖分配：0=否，1=是',\n\n `status` tinyint unsigned NOT NULL DEFAULT '1' COMMENT '状态：1=BetPlaced,2=FinalAllocated,3=Cancelled,4=Reversed',\n\n `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',\n `updated_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',\n\n PRIMARY KEY (`id`),\n KEY `idx_bet_order` (`bet_order_no`),\n KEY `idx_round` (`provider`, `round_id`),\n KEY `idx_uid_round` (`uid`, `provider`, `round_id`),\n KEY `idx_lot_status` (`lot_id`, `status`),\n KEY `idx_uid_status` (`uid`, `status`)\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='下注资金拆分表'\";\n Db::execute($betFundingSql);\n echo \"CREATE TABLE `{$db}`.`wallet_bet_funding_{$t}` success\" . PHP_EOL;\n }\n }\n }\n","old_string":"\n\n protected function initWalletStat()"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"提取可复用的建表逻辑，并在 `createSql()` 中调用，避免重复并保证新库一次性建全表。\n\n[REDACTED]"},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/command/InitDB.php","offset":125,"limit":120}},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/command/InitDB.php","offset":350,"limit":120}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"修复误删的 `protected function initWalletStat()` 声明。\n\n[REDACTED]"},{"type":"tool_use","name":"StrReplace","input":{"new_string":" }\n }\n\n protected function initWalletStat()\n {\n $shardInfo = config('app.shard');","old_string":" }\n }\n\n {\n $shardInfo = config('app.shard');","path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/command/InitDB.php"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"limit":30,"offset":212,"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/command/InitDB.php"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"确认 `initWalletStat` 完整。正在提取可复用的建表方法并接入 `createSql`。\n\n[REDACTED]"},{"type":"tool_use","name":"Read","input":{"limit":95,"offset":128,"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/command/InitDB.php"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"抽取可复用的建表执行函数，并从 `createSql()` 在无 echo 模式下调用。\n\n[REDACTED]"},{"type":"tool_use","name":"StrReplace","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/command/InitDB.php","old_string":" }\n\n /**\n * 钱包资金 Lot + 下注资金拆分表（shard 库wallet_xx、表后缀_xx）\n */\n protected function initWalletFundLotAndBetFunding()\n {\n $shardInfo = config('app.shard');\n for ($i = 1; $i <= $shardInfo['database_num']; $i++) {\n $db = sprintf(\"wallet_%02d\", $i);\n Db::execute(\"CREATE DATABASE IF NOT EXISTS `{$db}` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci\");\n Db::execute(\"use `{$db}` \");\n for ($j = 1; $j <= $shardInfo['table_num']; $j++) {\n $t = sprintf(\"%02d\", $j);\n\n $fundLotSql = \"CREATE TABLE `{$db}`.`wallet_fund_lot_{$t}` (\n `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',\n `uid` bigint unsigned NOT NULL COMMENT '用户ID',\n `currency` char(3) NOT NULL DEFAULT 'TGO' COMMENT '币种',\n\n `lot_no` varchar(64) NOT NULL COMMENT '资金Lot编号',\n `lot_type` tinyint unsigned NOT NULL COMMENT '资金类型：1=Deposit锁定充值，2=Bonus奖励额度',\n\n `source_type` tinyint unsigned NOT NULL DEFAULT '0' COMMENT '来源类型：1=注册奖励,2=首充奖励,3=活动奖励,4=充值,5=签到奖励,6=红包,7=领取Bonus,8=VIP输返,9=后台发放',\n `source_id` varchar(128) NOT NULL DEFAULT '' COMMENT '来源业务ID，如充值订单ID、奖励发放ID',\n\n `original_amount` bigint unsigned NOT NULL DEFAULT '0' COMMENT '原始金额',\n `remaining_amount` bigint unsigned NOT NULL DEFAULT '0' COMMENT '当前剩余金额',\n\n `wager_multiplier` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '打码倍数',\n `required_wager` bigint unsigned NOT NULL DEFAULT '0' COMMENT '所需有效投注额',\n `current_wager` bigint unsigned NOT NULL DEFAULT '0' COMMENT '当前已完成有效投注额',\n\n `consume_priority_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '消耗优先时间，Bonus默认领取时间，Deposit默认充值时间',\n `expires_at` datetime DEFAULT NULL COMMENT '过期时间，NULL表示不过期',\n\n `status` tinyint unsigned NOT NULL DEFAULT '1' COMMENT '状态：1=Waiting,2=Active,3=PendingConversion,4=Completed,5=PlayedOut,6=Cancelled,7=Reversed',\n `completed_at` datetime DEFAULT NULL COMMENT '完成时间',\n\n `brief` varchar(500) NOT NULL DEFAULT '' COMMENT '备注',\n `version` int unsigned NOT NULL DEFAULT '0' COMMENT '乐观锁版本号',\n\n `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',\n `updated_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',\n\n PRIMARY KEY (`id`),\n UNIQUE KEY `uk_lot_no` (`lot_no`),\n KEY `idx_uid_type_status_priority` (`uid`, `currency`, `lot_type`, `status`, `consume_priority_at`, `id`),\n KEY `idx_uid_status` (`uid`, `status`),\n KEY `idx_source` (`source_type`, `source_id`)\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='钱包资金Lot表，记录每笔充值和奖励的独立余额与打码进度'\";\n Db::execute($fundLotSql);\n echo \"CREATE TABLE `{$db}`.`wallet_fund_lot_{$t}` success\" . PHP_EOL;\n\n $betFundingSql = \"CREATE TABLE `{$db}`.`wallet_bet_funding_{$t}` (\n `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',\n `uid` bigint unsigned NOT NULL COMMENT '用户ID',\n `currency` char(3) NOT NULL DEFAULT 'TGO' COMMENT '币种',\n\n `provider` varchar(64) NOT NULL DEFAULT '' COMMENT '游戏厂商',\n `round_id` varchar(128) NOT NULL COMMENT '游戏局号',\n `bet_order_no` varchar(128) NOT NULL COMMENT '内部下注订单号',\n\n `fund_type` tinyint unsigned NOT NULL COMMENT '资金类型：1=Bonus，2=DepositLocked，3=Withdrawable',\n `lot_id` bigint unsigned NOT NULL DEFAULT '0' COMMENT '资金Lot ID，Withdrawable可为0',\n\n `bet_amount` bigint unsigned NOT NULL DEFAULT '0' COMMENT '本资金来源出资金额',\n `valid_bet_amount` bigint unsigned NOT NULL DEFAULT '0' COMMENT '计入任务的有效投注额',\n\n `allocated_payout_amount` bigint unsigned NOT NULL DEFAULT '0' COMMENT 'FinalSettle后分配到该资金来源的派奖金额',\n `is_final_allocated` tinyint unsigned NOT NULL DEFAULT '0' COMMENT '是否已完成最终派奖分配：0=否，1=是',\n\n `status` tinyint unsigned NOT NULL DEFAULT '1' COMMENT '状态：1=BetPlaced,2=FinalAllocated,3=Cancelled,4=Reversed',\n\n `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',\n `updated_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',\n\n PRIMARY KEY (`id`),\n KEY `idx_bet_order` (`bet_order_no`),\n KEY `idx_round` (`provider`, `round_id`),\n KEY `idx_uid_round` (`uid`, `provider`, `round_id`),\n KEY `idx_lot_status` (`lot_id`, `status`),\n KEY `idx_uid_status` (`uid`, `status`)\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='下注资金拆分表'\";\n Db::execute($betFundingSql);\n echo \"CREATE TABLE `{$db}`.`wallet_bet_funding_{$t}` success\" . PHP_EOL;\n }\n }\n }","new_string":" }\n\n /**\n * 创建 wallet_fund_lot_xx、wallet_bet_funding_xx（与 doc/wallet.md DDL 对齐）\n *\n * @param string $db 分库名，如 wallet_01\n * @param string $t 分表后缀，如 01\n * @param bool $log 是否输出成功日志\n */\n protected function executeCreateWalletFundLotAndBetFunding(string $db, string $t, bool $log = false): void\n {\n $fundLotSql = \"CREATE TABLE `{$db}`.`wallet_fund_lot_{$t}` (\n `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',\n `uid` bigint unsigned NOT NULL COMMENT '用户ID',\n `currency` char(3) NOT NULL DEFAULT 'TGO' COMMENT '币种',\n\n `lot_no` varchar(64) NOT NULL COMMENT '资金Lot编号',\n `lot_type` tinyint unsigned NOT NULL COMMENT '资金类型：1=Deposit锁定充值，2=Bonus奖励额度',\n\n `source_type` tinyint unsigned NOT NULL DEFAULT '0' COMMENT '来源类型：1=注册奖励,2=首充奖励,3=活动奖励,4=充值,5=签到奖励,6=红包,7=领取Bonus,8=VIP输返,9=后台发放',\n `source_id` varchar(128) NOT NULL DEFAULT '' COMMENT '来源业务ID，如充值订单ID、奖励发放ID',\n\n `original_amount` bigint unsigned NOT NULL DEFAULT '0' COMMENT '原始金额',\n `remaining_amount` bigint unsigned NOT NULL DEFAULT '0' COMMENT '当前剩余金额',\n\n `wager_multiplier` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '打码倍数',\n `required_wager` bigint unsigned NOT NULL DEFAULT '0' COMMENT '所需有效投注额',\n `current_wager` bigint unsigned NOT NULL DEFAULT '0' COMMENT '当前已完成有效投注额',\n\n `consume_priority_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '消耗优先时间，Bonus默认领取时间，Deposit默认充值时间',\n `expires_at` datetime DEFAULT NULL COMMENT '过期时间，NULL表示不过期',\n\n `status` tinyint unsigned NOT NULL DEFAULT '1' COMMENT '状态：1=Waiting,2=Active,3=PendingConversion,4=Completed,5=PlayedOut,6=Cancelled,7=Reversed',\n `completed_at` datetime DEFAULT NULL COMMENT '完成时间',\n\n `brief` varchar(500) NOT NULL DEFAULT '' COMMENT '备注',\n `version` int unsigned NOT NULL DEFAULT '0' COMMENT '乐观锁版本号',\n\n `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',\n `updated_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',\n\n PRIMARY KEY (`id`),\n UNIQUE KEY `uk_lot_no` (`lot_no`),\n KEY `idx_uid_type_status_priority` (`uid`, `currency`, `lot_type`, `status`, `consume_priority_at`, `id`),\n KEY `idx_uid_status` (`uid`, `status`),\n KEY `idx_source` (`source_type`, `source_id`)\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='钱包资金Lot表，记录每笔充值和奖励的独立余额与打码进度'\";\n Db::execute($fundLotSql);\n if ($log) {\n echo \"CREATE TABLE `{$db}`.`wallet_fund_lot_{$t}` success\" . PHP_EOL;\n }\n\n $betFundingSql = \"CREATE TABLE `{$db}`.`wallet_bet_funding_{$t}` (\n `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID',\n `uid` bigint unsigned NOT NULL COMMENT '用户ID',\n `currency` char(3) NOT NULL DEFAULT 'TGO' COMMENT '币种',\n\n `provider` varchar(64) NOT NULL DEFAULT '' COMMENT '游戏厂商',\n `round_id` varchar(128) NOT NULL COMMENT '游戏局号',\n `bet_order_no` varchar(128) NOT NULL COMMENT '内部下注订单号',\n\n `fund_type` tinyint unsigned NOT NULL COMMENT '资金类型：1=Bonus，2=DepositLocked，3=Withdrawable',\n `lot_id` bigint unsigned NOT NULL DEFAULT '0' COMMENT '资金Lot ID，Withdrawable可为0',\n\n `bet_amount` bigint unsigned NOT NULL DEFAULT '0' COMMENT '本资金来源出资金额',\n `valid_bet_amount` bigint unsigned NOT NULL DEFAULT '0' COMMENT '计入任务的有效投注额',\n\n `allocated_payout_amount` bigint unsigned NOT NULL DEFAULT '0' COMMENT 'FinalSettle后分配到该资金来源的派奖金额',\n `is_final_allocated` tinyint unsigned NOT NULL DEFAULT '0' COMMENT '是否已完成最终派奖分配：0=否，1=是',\n\n `status` tinyint unsigned NOT NULL DEFAULT '1' COMMENT '状态：1=BetPlaced,2=FinalAllocated,3=Cancelled,4=Reversed',\n\n `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',\n `updated_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',\n\n PRIMARY KEY (`id`),\n KEY `idx_bet_order` (`bet_order_no`),\n KEY `idx_round` (`provider`, `round_id`),\n KEY `idx_uid_round` (`uid`, `provider`, `round_id`),\n KEY `idx_lot_status` (`lot_id`, `status`),\n KEY `idx_uid_status` (`uid`, `status`)\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='下注资金拆分表'\";\n Db::execute($betFundingSql);\n if ($log) {\n echo \"CREATE TABLE `{$db}`.`wallet_bet_funding_{$t}` success\" . PHP_EOL;\n }\n }\n\n /**\n * 钱包资金 Lot + 下注资金拆分表（shard 库 wallet_xx、表后缀_xx）\n * 执行：php think initDB initWalletFundLotAndBetFunding\n */\n protected function initWalletFundLotAndBetFunding()\n {\n $shardInfo = config('app.shard');\n for ($i = 1; $i <= $shardInfo['database_num']; $i++) {\n $db = sprintf(\"wallet_%02d\", $i);\n Db::execute(\"CREATE DATABASE IF NOT EXISTS `{$db}` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci\");\n Db::execute(\"use `{$db}` \");\n for ($j = 1; $j <= $shardInfo['table_num']; $j++) {\n $t = sprintf(\"%02d\", $j);\n $this->executeCreateWalletFundLotAndBetFunding($db, $t, true);\n }\n }\n }"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"limit":130,"offset":125,"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/command/InitDB.php"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"StrReplace","input":{"new_string":" Db::execute($statSql);\n\n $this->executeCreateWalletFundLotAndBetFunding($db, $t, false);\n\n\n }","old_string":" Db::execute($statSql);\n\n\n }","path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/command/InitDB.php"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Shell","input":{"command":"php -l /Users/ray/Documents/project/www/ray/slot-wallet/app/command/InitDB.php","description":"PHP syntax check InitDB.php"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"ReadLints","input":{"paths":["/Users/ray/Documents/project/www/ray/slot-wallet/app/command/InitDB.php"]}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"已在 `app/command/InitDB.php`（项目里是这个名字，不叫 `commandInitDB.php`）里加上 **`wallet_fund_lot_xx` / `wallet_bet_funding_xx`** 的初始化，结构和 `doc/wallet.md` 里的 DDL 一致。\n\n### 做了啥\n\n1. **`executeCreateWalletFundLotAndBetFunding(string $db, string $t, bool $log = false)`** \n - 在两个分片上执行 `CREATE TABLE`，避免 SQL 拷贝两份。\n\n2. **`initWalletFundLotAndBetFunding()`**（与 `initWalletLog` 同类） \n - `CREATE DATABASE IF NOT EXISTS` → `use` → 对每个 `wallet_XX`、`XX` 分表后缀建 **`wallet_fund_lot_{$t}`**、**`wallet_bet_funding_{$t}`**。 \n - `$log === true` 时打印 success 行。\n\n3. **`createSql()`** \n - 在 `wallet_stat_{$t}` 之后对每个分片调用 **`executeCreateWalletFundLotAndBetFunding($db, $t, false)`**，新建库时顺带建好这两张表。\n\n### 怎么用\n\n仅补建 Lot / BetFunding 表（已有库、不删库）：\n\n```bash\nphp think initDB initWalletFundLotAndBetFunding\n```\n\n走原有「一键建库」流程时，执行 **`createSql`** 会带上这两张表。\n\n**说明**：若表里已存在同名表，`CREATE TABLE` 会报错，需要你们用迁移或先 `DROP` 再跑（与现有 `initWalletLog` 行为一致）。\n\n[REDACTED]"}]}}
|
||
{"role":"user","message":{"content":[{"type":"text","text":"<user_query>\n我去除了wallet_bet_funding_xx表的provider、bet_order_no 这两个字段，跟你同步一下\n</user_query>"}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"正在将文档与 `InitDB.php` 中的 `wallet_bet_funding` 表定义与您移除的字段同步。\n\n[REDACTED]"},{"type":"tool_use","name":"Grep","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet","pattern":"wallet_bet_funding|bet_order_no|`provider`"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"limit":50,"offset":638,"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md"}},{"type":"tool_use","name":"Read","input":{"limit":45,"offset":1033,"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md"}},{"type":"tool_use","name":"Read","input":{"limit":45,"offset":178,"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/command/InitDB.php"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Grep","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","pattern":"bet_order|bet_id|wallet_bet_funding"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"文档附录 DDL 已无 `provider`、`bet_order_no`。我们将 §18.3 字段说明与 DDL 对齐，并在 `InitDB.php` 补上与文档一致的 `idx_round` 索引。\n\n[REDACTED]"},{"type":"tool_use","name":"StrReplace","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","new_string":"### 18.3 `wallet_bet_funding_01`\n\n每笔下注的资金来源拆分。（厂商、内部下注单号如需可查可放在 **`wallet_game_round` / 日志 / 幂等表**，本表不参与存储。）\n\n| 字段 | 说明 |\n| ------------------------------------------------------ | -------------------------------- |\n| `id` | 主键 |\n| `uid` / `currency` | 用户与币种 |\n| `round_id` | 游戏局号（与 Round 结算对齐） |\n| `fund_type` | 1=Bonus，2=DepositLocked，3=Withdrawable |\n| `lot_id` | Lot ID（Withdrawable 可为 0） |\n| `bet_amount` / `valid_bet_amount` | 出资与有效投注 |\n| `allocated_payout_amount` / `is_final_allocated` | FinalSettle 派奖分配与是否已结算标记 |\n| `status` | BetPlaced / FinalAllocated / … |","old_string":"### 18.3 `wallet_bet_funding_01`\n\n每笔下注的资金来源拆分。\n\n| 字段 | 说明 |\n|-----------------------------------|----------------------------------|\n| `bet_id` | 下注订单 ID |\n| `round_id` | 游戏 Round ID |\n| `fund_type` | 1=Bonus，2=Deposit，3=Withdrawable |\n| `lot_id` | Lot ID（Withdrawable 可为 0） |\n| `bet_amount` / `valid_bet_amount` | 出资与有效投注 |\n| `allocated_payout_amount` | FinalSettle 后分配派奖 |\n| `status` | 状态 |"}},{"type":"tool_use","name":"StrReplace","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/doc/wallet.md","new_string":" KEY `idx_round` (`round_id`),","old_string":" KEY `idx_round` ( `round_id`),"}},{"type":"tool_use","name":"StrReplace","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/command/InitDB.php","new_string":" PRIMARY KEY (`id`),\n KEY `idx_round` (`round_id`),\n KEY `idx_uid_round` (`uid`, `round_id`),","old_string":" PRIMARY KEY (`id`),\n KEY `idx_uid_round` (`uid`, `round_id`),"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Grep","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet","pattern":"bet_order_no|wallet_bet_funding.*provider"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"已按你现在的表结构做了同步，变更如下：\n\n### 1. `doc/wallet.md`\n- **§18.3** 已与当前 DDL 对齐：去掉原有的 `bet_id` 表述（表结构里本就没有该列），补上 `id`、`uid`/`currency`、`is_final_allocated` 等；并写明 **厂商 / 内部下注单** 如需可查，放在 **`wallet_game_round` / 日志 / 幂等表**，不放在 `wallet_bet_funding`。\n- 附录 DDL 里 `idx_round` 的括号格式已改成规范的 ``(`round_id`)``（你本地的 DDL 本身已不含 `provider`、`bet_order_no`）。\n\n### 2. `app/command/InitDB.php`\n- `wallet_bet_funding_xx` 的建表语句已与现结构一致（本来就没有这两个字段）。\n- 补上与文档一致的 **`KEY idx_round (round_id)`**（原先只有 `idx_uid_round`，与附录不完全一致）。\n\n若你之后在 `wallet_game_round` 或其它表字段名上也有调整，可以说一下再一起对齐文档与 `InitDB`。\n\n[REDACTED]"}]}}
|
||
{"role":"user","message":{"content":[{"type":"text","text":"<user_query>\n请阅读 README.md文件，了接我的开发规范\n</user_query>"}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/README.md"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"已读完仓库里的 `README.md`。下面是与你协作时会默认遵守的**开发规范要点**（概括版）。\n\n### 项目性质与优先级\n\n- **资金类核心服务**：正确性 > 速度；幂等与可追溯 >「先跑通」；分层清晰 > 逻辑堆在 Controller；小步可回滚；生产可观测。\n- 涉及余额、提现、返奖、打码、MQ、缓存一致性 → **按高风险变更**处理。\n\n### 技术栈与命令\n\n- PHP ≥ 8.0，`webman` + `think-orm` + Redis + RabbitMQ 等。\n- 本地常用：`composer install`、`php webman start`；**`php webman initDB <method>`** 属于高风险，禁在生产随便试错。\n\n### 分层红线（最重要）\n\n| 层级 | 职责 |\n|------|------|\n| `controller` | 收参、校验、组 DTO、调 Logic/Service、返回；**不写核心资金逻辑、不写 SQL、不拼 MQ** |\n| `logic` | 编排事务、调 Service、领域异常 |\n| `service` | 业务能力、原子操作 |\n| `model/multi` | 分片读写，**不写复杂业务** |\n| `dto` / `validator` / `entity` | 各司其职，DTO 不写 DB |\n\n跨分片、多步骤必须由 **Logic 显式编排**。\n\n### 编码\n\n- **PSR-12**，新代码要有类型与返回值；公共方法简要 PHPDoc；禁止调试残留、禁止大段注释旧代码丢 Git。\n- 命名：`Controller`/`Logic`/`Service`/`Model`/`Validator`/语义化 Exception。\n- **金额**：整数传递存储，禁止 float；写明单位（分/厘等）；跨桶转账要明确来源与目标。\n\n### 钱包专项\n\n- 每笔变动：**业务类型 + 可追溯（uid/currency/biz 等）**；扣减先校验余额；多步骤要有失败补偿/回滚；**缓存不能当账本**。\n- **`version` 乐观锁**：更新带旧 version；冲突要有上限重试且幂等。\n- **事务**：初始化、账变+日志、提现冻结/完成/回滚、任务与资金联动等必须用事务；事务内禁止外部 HTTP、危险 MQ。\n- **幂等**：持久化幂等键；命中返回须稳定。\n- **缓存**：只加速读；写库成功后删缓存；禁止先缓存后库、禁止按缓存做最终扣款。\n\n### 数据库与脚本\n\n- **按 uid 分库分表**，路由规则统一；更新要带足条件（如 `uid + currency + version`）。\n- 生产 SQL/DDL：**先在 `doc/` 留变更说明**；高风险 DDL 要写影响与回滚。\n- **`InitDB.php`**：方法名表意；默认不搞破坏性操作；`drop/delete/correct` 要环境保护；新脚本要 README 或 doc 说明。\n\n### 接口 / MQ / 日志 / 发布 / 文档\n\n- 对外接口：**Validator**；金额、UID、币种、biz 单号必填校验；**动态 `type` 分发必须白名单**（文档特别提醒 `WalletLogic::run()`）。\n- MQ：消费幂等；**账务以 DB 提交为准**，禁止「先发 MQ 再写账」。\n- 日志：`trace_id`、资金变更上下文；分级使用得当。\n- 发布前后检查清单（配置、备份、回滚、抽样验账等）。\n- **`doc/`**：背景、日期、负责人、范围、API/SQL/脚本、风险回滚；核心变更需同步 **README**。\n\n---\n\n后续在你这个项目里写代码、改库、加脚本时，我会按上述分层与资金安全约束来做；若你有局部例外（例如某接口暂时不走 Validator），最好在评审里写明，我也可以只在约定范围内遵守。\n\n如果你希望我根据 README **单独提炼一条「给 AI 用的简短 RULE」**放进 `.cursor/rules`，可以说一声我帮你起草一版。\n\n[REDACTED]"}]}}
|
||
{"role":"user","message":{"content":[{"type":"text","text":"<user_query>\n根据wallet.md文件需求文档，现在来实现下注\n</user_query>"}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"分析 `doc/wallet.md` 中的下注规则并梳理现有代码结构，以实现下注流程。\n\n[REDACTED]"},{"type":"tool_use","name":"SemanticSearch","input":{"query":"Where is wallet bet or betting handled?","target_directories":["/Users/ray/Documents/project/www/ray/slot-wallet"],"num_results":25}},{"type":"tool_use","name":"Glob","input":{"target_directory":"/Users/ray/Documents/project/www/ray/slot-wallet","glob_pattern":"**/*Wallet*.php"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/model/multi/BaseMultiModel.php"}},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/model/multi/WalletShardModel.php"}},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/model/multi/WalletAccountModel.php"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/service/ShardService.php","limit":120}},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/model/SelfBaseModel.php","limit":80}},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/api/logic/WalletLogic.php","limit":180}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Grep","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet","pattern":"wallet_game_round|WalletGameRound"}},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/api/dto/request/wallet/WalletUpdateRequestDTO.php"}},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/api/controller/WalletController.php"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/model/multi/WalletLogModel.php","limit":80}},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/api/logic/WalletLogic.php","offset":680,"limit":200}},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/validator/Wallet2Validator.php"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/model/SelfBaseModel.php","offset":80}},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/service/WalletLogService.php","limit":80}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"实现 PRD 要求的 Lot 级拆分、`wallet_bet_funding` 落库与 Lot 上 `remaining_amount`/`current_wager` 更新；`wallet_game_round` 表尚未在代码库中建表，本轮先留 TODO（Redis 仍保存回合汇总以便派奖）。\n\n[REDACTED]"},{"type":"tool_use","name":"Glob","input":{"target_directory":"/Users/ray/Documents/project/www/ray/slot-wallet/config","glob_pattern":"**/*.php"}},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/model/SelfBaseModel.php","limit":30}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"limit":40,"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/model/multi/WalletStatModel.php"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Grep","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/support","pattern":"WALLET_"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Grep","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet","pattern":"->minus\\(|'minus'|BIZ_TYPE_BET"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"limit":95,"offset":168,"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/api/logic/WalletLogic.php"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"limit":80,"path":"/Users/ray/Documents/project/www/ray/slot-wallet/config/app.php"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/api/dto/BaseDTO.php"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"正在实现：`WalletFundLotModel`、`WalletBetFundingModel`、`WalletBetService`，并重构 `WalletLogic::minus()`（下注走 Lot 拆分、`wallet_bet_funding` 落库、事务后写 Redis）。\n\n[REDACTED]"},{"type":"tool_use","name":"Write","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/config/wallet.php","contents":"<?php\n\n/**\n * 钱包业务参数（下注 / Lot 等）\n */\nreturn [\n /** 有效投注占下注金额的比例：10000 = 100%，与 PRD game_wager_contribution_rate 对齐（整数运算） */\n 'default_wager_contribution_bp' => (int)(getenv('WALLET_DEFAULT_WAGER_CONTRIBUTION_BP') ?: 10000),\n];\n"}},{"type":"tool_use","name":"Write","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/model/multi/WalletFundLotModel.php","contents":"<?php\n\nnamespace app\\model\\multi;\n\nuse think\\facade\\Db;\n\n/**\n * wallet_fund_lot_xx — 单笔充值/Bonus 资金归属（见 doc/wallet.md）\n *\n * @property int $id\n * @property int $uid\n * @property string $currency\n */\nclass WalletFundLotModel extends BaseMultiModel\n{\n public const LOT_TYPE_DEPOSIT = 1;\n\n public const LOT_TYPE_BONUS = 2;\n\n /** @see doc/wallet.md §19.2 */\n public const STATUS_WAITING = 1;\n\n public const STATUS_ACTIVE = 2;\n\n protected function getShardKey(): string\n {\n return 'uid';\n }\n\n protected function getPreDatabase(): string\n {\n return 'wallet';\n }\n\n protected function getPreTable(): string\n {\n return 'wallet_fund_lot';\n }\n\n /**\n * 可参与下注消耗的 Lot：Active + remaining > 0，FIFO（consume_priority_at, id）\n *\n * @return array<int, array<string, mixed>>\n */\n public function listActiveLotsForConsumption(int $lotType, string $currency): array\n {\n return $this->getDb()->where([\n ['uid', '=', $this->_shardVal],\n ['currency', '=', $currency],\n ['lot_type', '=', $lotType],\n ['status', '=', self::STATUS_ACTIVE],\n ['remaining_amount', '>', 0],\n ])->order('consume_priority_at asc,id asc')->select()->toArray();\n }\n\n /**\n * 扣减 Lot 剩余、累加有效流水进度（单行乐观锁）\n *\n * @return int 影响行数（期望为 1）\n */\n public function consumeRemainingAndIncWager(\n int $lotId,\n int $consumeAmount,\n int $incWager,\n int $expectVersion,\n string $currency\n ): int {\n $where = [\n ['id', '=', $lotId],\n ['uid', '=', $this->_shardVal],\n ['currency', '=', $currency],\n ['version', '=', $expectVersion],\n ['remaining_amount', '>=', $consumeAmount],\n ['status', '=', self::STATUS_ACTIVE],\n ];\n $data = [\n 'remaining_amount' => Db::raw('remaining_amount - ' . $consumeAmount),\n 'current_wager' => Db::raw('current_wager + ' . $incWager),\n 'version' => Db::raw('version + 1'),\n ];\n\n return $this->updateByWhere($where, $data);\n }\n}\n"}},{"type":"tool_use","name":"Write","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/model/multi/WalletBetFundingModel.php","contents":"<?php\n\nnamespace app\\model\\multi;\n\n/**\n * wallet_bet_funding_xx — 单笔下注资金来源拆分（见 doc/wallet.md）\n */\nclass WalletBetFundingModel extends BaseMultiModel\n{\n public const FUND_TYPE_BONUS = 1;\n\n public const FUND_TYPE_DEPOSIT_LOCKED = 2;\n\n public const FUND_TYPE_WITHDRAWABLE = 3;\n\n /** BetPlaced */\n public const STATUS_BET_PLACED = 1;\n\n protected function getShardKey(): string\n {\n return 'uid';\n }\n\n protected function getPreDatabase(): string\n {\n return 'wallet';\n }\n\n protected function getPreTable(): string\n {\n return 'wallet_bet_funding';\n }\n\n /**\n * @param array<int, array<string, mixed>> $rows\n */\n public function insertAllRows(array $rows): bool\n {\n if ($rows === []) {\n return true;\n }\n\n return $this->getDb()->insertAll($rows) >= 1;\n }\n}\n"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"StrReplace","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/model/multi/WalletBetFundingModel.php","old_string":" /**\n * @param array<int, array<string, mixed>> $rows\n */\n public function insertAllRows(array $rows): bool\n {\n if ($rows === []) {\n return true;\n }\n\n return $this->getDb()->insertAll($rows) >= 1;\n }\n}","new_string":" /**\n * @param array<int, array<string, mixed>> $rows\n */\n public function insertAllRows(array $rows): void\n {\n if ($rows === []) {\n return;\n }\n $n = $this->getDb()->insertAll($rows);\n if ($n === false) {\n throw new \\RuntimeException('wallet_bet_funding insertAll failed');\n }\n }\n}"}},{"type":"tool_use","name":"Write","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/service/wallet/WalletBetService.php","contents":"<?php\n\nnamespace app\\service\\wallet;\n\nuse app\\model\\multi\\WalletBetFundingModel;\nuse app\\model\\multi\\WalletFundLotModel;\nuse app\\service\\WalletException;\nuse support\\ErrorCode;\n\n/**\n * 下注扣款 — Lot 拆分与 wallet_bet_funding 写入（doc/wallet.md §9 / §10 / §20.3）\n */\nclass WalletBetService\n{\n /**\n * @return array{rows: array<int, array<string, mixed>>, fundings_redis: array<int, array<string, int>>}\n *\n * @throws WalletException\n */\n public function applyLotDeductionsForBet(\n int $uid,\n string $currency,\n int $bonusNeed,\n int $depositNeed,\n int $withdrawNeed,\n string $roundId,\n int $wagerBp\n ): array {\n $fundLotModel = new WalletFundLotModel($uid);\n $fundingRows = [];\n $fundingsRedis = [];\n\n $wagerBp = self::normalizeWagerBp($wagerBp);\n\n if ($bonusNeed > 0) {\n $lots = $fundLotModel->listActiveLotsForConsumption(WalletFundLotModel::LOT_TYPE_BONUS, $currency);\n $plan = $this->allocateFifoFromLots($lots, $bonusNeed);\n foreach ($plan as $touch) {\n $validBet = $this->validBetAmount($touch['consume'], $wagerBp);\n $aff = $fundLotModel->consumeRemainingAndIncWager(\n $touch['lot_id'],\n $touch['consume'],\n $validBet,\n $touch['version'],\n $currency\n );\n if ($aff !== 1) {\n throw new WalletException('Bonus Lot 更新失败（并发或额度不足）', ErrorCode::WALLET_CONFLICT_ERROR);\n }\n $fundingRows[] = $this->makeFundingRow(\n $uid,\n $currency,\n $roundId,\n WalletBetFundingModel::FUND_TYPE_BONUS,\n $touch['lot_id'],\n $touch['consume'],\n $validBet\n );\n $fundingsRedis[] = [\n 'fund_type' => WalletBetFundingModel::FUND_TYPE_BONUS,\n 'lot_id' => $touch['lot_id'],\n 'bet_amount' => $touch['consume'],\n ];\n }\n }\n\n if ($depositNeed > 0) {\n $lots = $fundLotModel->listActiveLotsForConsumption(WalletFundLotModel::LOT_TYPE_DEPOSIT, $currency);\n $plan = $this->allocateFifoFromLots($lots, $depositNeed);\n foreach ($plan as $touch) {\n $validBet = $this->validBetAmount($touch['consume'], $wagerBp);\n $aff = $fundLotModel->consumeRemainingAndIncWager(\n $touch['lot_id'],\n $touch['consume'],\n $validBet,\n $touch['version'],\n $currency\n );\n if ($aff !== 1) {\n throw new WalletException('Deposit Lot 更新失败（并发或额度不足）', ErrorCode::WALLET_CONFLICT_ERROR);\n }\n $fundingRows[] = $this->makeFundingRow(\n $uid,\n $currency,\n $roundId,\n WalletBetFundingModel::FUND_TYPE_DEPOSIT_LOCKED,\n $touch['lot_id'],\n $touch['consume'],\n $validBet\n );\n $fundingsRedis[] = [\n 'fund_type' => WalletBetFundingModel::FUND_TYPE_DEPOSIT_LOCKED,\n 'lot_id' => $touch['lot_id'],\n 'bet_amount' => $touch['consume'],\n ];\n }\n }\n\n if ($withdrawNeed > 0) {\n $validBet = $this->validBetAmount($withdrawNeed, $wagerBp);\n $fundingRows[] = $this->makeFundingRow(\n $uid,\n $currency,\n $roundId,\n WalletBetFundingModel::FUND_TYPE_WITHDRAWABLE,\n 0,\n $withdrawNeed,\n $validBet\n );\n $fundingsRedis[] = [\n 'fund_type' => WalletBetFundingModel::FUND_TYPE_WITHDRAWABLE,\n 'lot_id' => 0,\n 'bet_amount' => $withdrawNeed,\n ];\n }\n\n return ['rows' => $fundingRows, 'fundings_redis' => $fundingsRedis];\n }\n\n /**\n * @param array<int, array<string, mixed>> $rows\n *\n * @throws WalletException\n */\n public function persistFundingRows(int $uid, array $rows): void\n {\n if ($rows === []) {\n return;\n }\n try {\n (new WalletBetFundingModel($uid))->insertAllRows($rows);\n } catch (\\Throwable $e) {\n throw new WalletException('写入 wallet_bet_funding 失败', ErrorCode::WALLET_INSERT_ERROR);\n }\n }\n\n public static function normalizeWagerBp(?int $bp): int\n {\n $def = (int)(config('wallet.default_wager_contribution_bp') ?? 10000);\n if ($bp === null || $bp <= 0) {\n return max(1, min(10000, $def));\n }\n\n return max(1, min(10000, $bp));\n }\n\n /**\n * 纯整数：floor(betAmount * bp / 10000)\n */\n private function validBetAmount(int $betAmount, int $wagerBp): int\n {\n if ($betAmount <= 0 || $wagerBp <= 0) {\n return 0;\n }\n\n return intdiv($betAmount * $wagerBp, 10000);\n }\n\n /**\n * @param array<int, array<string, mixed>> $lots\n *\n * @return array<int, array{lot_id: int, version: int, consume: int}>\n *\n * @throws WalletException\n */\n private function allocateFifoFromLots(array $lots, int $needAmount): array\n {\n $plan = [];\n $left = $needAmount;\n foreach ($lots as $row) {\n if ($left <= 0) {\n break;\n }\n $avail = (int)($row['remaining_amount'] ?? 0);\n if ($avail <= 0) {\n continue;\n }\n $take = min($left, $avail);\n $plan[] = [\n 'lot_id' => (int)$row['id'],\n 'version' => (int)$row['version'],\n 'consume' => $take,\n ];\n $left -= $take;\n }\n if ($left > 0) {\n throw new WalletException(\n 'Lot 可用额度不足以覆盖本次下注分摊（Bonus/Deposit 需与聚合余额同步并有 Active Lot）',\n ErrorCode::WALLET_BALANCE_NOT_ENOUGH\n );\n }\n\n return $plan;\n }\n\n /**\n * @return array<string, mixed>\n */\n private function makeFundingRow(\n int $uid,\n string $currency,\n string $roundId,\n int $fundType,\n int $lotId,\n int $betAmount,\n int $validBet\n ): array {\n return [\n 'uid' => $uid,\n 'currency' => $currency,\n 'round_id' => $roundId,\n 'fund_type' => $fundType,\n 'lot_id' => $lotId,\n 'bet_amount' => $betAmount,\n 'valid_bet_amount' => $validBet,\n 'allocated_payout_amount' => 0,\n 'is_final_allocated' => 0,\n 'status' => WalletBetFundingModel::STATUS_BET_PLACED,\n ];\n }\n}\n"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"StrReplace","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/service/wallet/WalletBetService.php","old_string":" $wagerBp = self::normalizeWagerBp($wagerBp);\n\n if ($bonusNeed > 0) {","new_string":" $wagerBp = self::normalizeWagerContributionBp($wagerBp);\n\n if ($bonusNeed > 0) {"}},{"type":"tool_use","name":"StrReplace","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/service/wallet/WalletBetService.php","old_string":" public static function normalizeWagerBp(?int $bp): int\n {\n $def = (int)(config('wallet.default_wager_contribution_bp') ?? 10000);\n if ($bp === null || $bp <= 0) {\n return max(1, min(10000, $def));\n }\n\n return max(1, min(10000, $bp));\n }","new_string":" /**\n * @param int $bp 客户端传入；<=0 时使用 config wallet.default_wager_contribution_bp\n */\n public static function normalizeWagerContributionBp(int $bp = 0): int\n {\n $def = (int)(config('wallet.default_wager_contribution_bp') ?? 10000);\n $def = max(1, min(10000, $def));\n if ($bp <= 0) {\n return $def;\n }\n\n return max(1, min(10000, $bp));\n }"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"StrReplace","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/api/dto/request/wallet/WalletUpdateRequestDTO.php","old_string":" /**\n * @var string 游戏局号，用于关联同一局的 bet/win\n */\n public string $round_id = '';\n\n /**\n * @var string 奖励币种\n */\n public string $currency;","new_string":" /**\n * @var string 游戏局号，用于关联同一局的 bet/win\n */\n public string $round_id = '';\n\n /**\n * 有效投注贡献比例（万分比）：10000=100%，0 表示使用 config(wallet.default_wager_contribution_bp)\n */\n public int $wager_contribution_bp = 0;\n\n /**\n * @var string 奖励币种\n */\n public string $currency;"}},{"type":"tool_use","name":"StrReplace","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/api/logic/WalletLogic.php","old_string":"use app\\service\\wallet\\RechargeExchangeService;","new_string":"use app\\service\\wallet\\WalletBetService;\nuse app\\service\\wallet\\RechargeExchangeService;"}},{"type":"tool_use","name":"StrReplace","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/api/logic/WalletLogic.php","old_string":" public function minus()\n {\n return $this->maxRetry(function () {\n $model = new WalletAccountModel($this->requestDTO->uid);\n $model->startTrans();\n try {\n $info = $model->wallet($this->requestDTO->currency);\n if (is_null($info)) {\n $info = $this->initWalletWithoutMoney();\n }\n if (is_null($info)) {\n throw new WalletException(\"数据不存在\", ErrorCode::PARAMS_NOT_FOUND);\n }\n\n $balance = $this->getBalance($info);\n $availableBonus = $info->frozen_bonus;\n $totalBalance = $balance + $availableBonus;\n if ($totalBalance < $this->requestDTO->fee) {\n throw new WalletException(\"有效余额不足\", ErrorCode::WALLET_BALANCE_NOT_ENOUGH);\n }\n\n // 新下注扣款顺序：\n // 1. Bonus Balance (available_bonus)\n // 2. Locked (Deposit) Balance\n // 3. Withdrawable Balance\n $bonus = min($availableBonus, $this->requestDTO->fee);\n $remaining = $this->requestDTO->fee - $bonus;\n\n $withdraw = 0;\n $deposit = min($info->deposit_balance, $remaining);\n $remaining -= $deposit;\n\n if ($remaining > 0) {\n $withdraw = $remaining;\n }\n\n $ok = $model->decBalance($withdraw, $deposit, $bonus, 0, $info->version, $this->requestDTO->currency);\n if ($ok != 1) {\n throw new WalletException('数据冲突retry', ErrorCode::WALLET_CONFLICT_ERROR);\n }\n $balance = $balance - $this->requestDTO->fee;\n $this->cacheBetSplitByRound($withdraw, $deposit, $bonus);\n\n $ok = $this->addLog(\n $this->requestDTO->fee * -1,\n $balance,\n WalletLogModel::BIZ_TYPE_BET,\n WalletLogModel::WALLET_TYPE_GAME,\n $this->buildBetSplitRemark($withdraw, $deposit, $bonus)\n );\n if ($ok != 1) {\n throw new WalletException('数据冲突retry', ErrorCode::WALLET_CONFLICT_ERROR);\n }\n// if($this->requestDTO->type == WalletLogModel::BIZ_TYPE_BET){\n// //todo 更新打码任务\n// }\n $model->commit();\n if ($this->requestDTO->type == WalletLogModel::BIZ_TYPE_BET) {\n $this->sendConsoleBus('bet', $this->requestDTO->fee);\n }\n return new WalletEntity([\n 'd' => $info->deposit_balance - $deposit,\n 'deposit' => $info->deposit_balance - $deposit,\n 'w' => $info->withdraw_balance - $withdraw,\n 'withdraw' => $info->withdraw_balance - $withdraw,\n 'b' => $info->frozen_bonus - $bonus,\n 'ub' => $info->available_bonus\n ]);\n } catch (Throwable $e) {\n $model->rollback();\n throw $e;\n }\n\n });\n }","new_string":" public function minus()\n {\n return $this->maxRetry(function () {\n $model = new WalletAccountModel($this->requestDTO->uid);\n $model->startTrans();\n try {\n $info = $model->wallet($this->requestDTO->currency);\n if (is_null($info)) {\n $info = $this->initWalletWithoutMoney();\n }\n if (is_null($info)) {\n throw new WalletException(\"数据不存在\", ErrorCode::PARAMS_NOT_FOUND);\n }\n\n $balance = $this->getBalance($info);\n $availableBonus = $info->frozen_bonus;\n $totalBalance = $balance + $availableBonus;\n if ($totalBalance < $this->requestDTO->fee) {\n throw new WalletException(\"有效余额不足\", ErrorCode::WALLET_BALANCE_NOT_ENOUGH);\n }\n\n // 扣款顺序（doc/wallet.md）：Bonus Credits → Locked Deposit → Withdrawable\n $bonus = min($availableBonus, $this->requestDTO->fee);\n $remaining = $this->requestDTO->fee - $bonus;\n\n $withdraw = 0;\n $deposit = min($info->deposit_balance, $remaining);\n $remaining -= $deposit;\n\n if ($remaining > 0) {\n $withdraw = $remaining;\n }\n\n $fundingsRedisExtra = [];\n $fundingRows = [];\n if ($this->requestDTO->type === WalletLogModel::BIZ_TYPE_BET && $this->requestDTO->fee > 0) {\n $betSvc = new WalletBetService();\n $wagerBp = WalletBetService::normalizeWagerContributionBp($this->requestDTO->wager_contribution_bp);\n $pack = $betSvc->applyLotDeductionsForBet(\n $this->requestDTO->uid,\n $this->requestDTO->currency,\n $bonus,\n $deposit,\n $withdraw,\n $this->requestDTO->round_id,\n $wagerBp\n );\n $fundingRows = $pack['rows'];\n $fundingsRedisExtra = $pack['fundings_redis'];\n }\n\n $ok = $model->decBalance($withdraw, $deposit, $bonus, 0, $info->version, $this->requestDTO->currency);\n if ($ok != 1) {\n throw new WalletException('数据冲突retry', ErrorCode::WALLET_CONFLICT_ERROR);\n }\n\n if ($fundingRows !== []) {\n $betSvc = new WalletBetService();\n $betSvc->persistFundingRows($this->requestDTO->uid, $fundingRows);\n }\n\n $balance = $balance - $this->requestDTO->fee;\n\n $ok = $this->addLog(\n $this->requestDTO->fee * -1,\n $balance,\n WalletLogModel::BIZ_TYPE_BET,\n WalletLogModel::WALLET_TYPE_GAME,\n $this->buildBetSplitRemark($withdraw, $deposit, $bonus, $fundingsRedisExtra)\n );\n if ($ok != 1) {\n throw new WalletException('数据冲突retry', ErrorCode::WALLET_CONFLICT_ERROR);\n }\n $model->commit();\n\n $this->cacheBetSplitByRound($withdraw, $deposit, $bonus, $fundingsRedisExtra);\n\n if ($this->requestDTO->type == WalletLogModel::BIZ_TYPE_BET) {\n $this->sendConsoleBus('bet', $this->requestDTO->fee);\n }\n return new WalletEntity([\n 'd' => $info->deposit_balance - $deposit,\n 'deposit' => $info->deposit_balance - $deposit,\n 'w' => $info->withdraw_balance - $withdraw,\n 'withdraw' => $info->withdraw_balance - $withdraw,\n 'b' => $info->frozen_bonus - $bonus,\n 'ub' => $info->available_bonus\n ]);\n } catch (Throwable $e) {\n $model->rollback();\n throw $e;\n }\n\n });\n }"}},{"type":"tool_use","name":"StrReplace","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/api/logic/WalletLogic.php","old_string":" private function buildBetSplitRemark(int $withdraw, int $deposit, int $bonus): string\n {\n return json_encode([\n 'round_id' => $this->requestDTO->round_id,\n 'withdraw' => $withdraw,\n 'deposit' => $deposit,\n 'bonus' => $bonus,\n ], JSON_UNESCAPED_UNICODE);\n }\n\n private function cacheBetSplitByRound(int $withdraw, int $deposit, int $bonus): void\n {\n if ($this->requestDTO->round_id === '') {\n return;\n }\n $key = RedisKeyManagerService::getBetSplitRoundKey(\n $this->requestDTO->uid,\n $this->requestDTO->currency,\n $this->requestDTO->round_id\n );\n\n $current = Redis::get($key);\n $split = [\n 'bonus' => 0,\n 'deposit' => 0,\n 'withdraw' => 0,\n ];\n if (!empty($current)) {\n $decoded = json_decode($current, true);\n if (is_array($decoded)) {\n $split['bonus'] = (int)($decoded['bonus'] ?? 0);\n $split['deposit'] = (int)($decoded['deposit'] ?? 0);\n $split['withdraw'] = (int)($decoded['withdraw'] ?? 0);\n }\n }\n $split['bonus'] += $bonus;\n $split['deposit'] += $deposit;\n $split['withdraw'] += $withdraw;\n Redis::setEx($key, 86400, json_encode($split, JSON_UNESCAPED_UNICODE));\n }","new_string":" /**\n * @param array<int, array<string, int>> $fundingsDetail fund_type / lot_id / bet_amount，用于 Redis 回合维度汇总（后续 FinalSettle 可按 Lot 分摊）\n */\n private function buildBetSplitRemark(int $withdraw, int $deposit, int $bonus, array $fundingsDetail = []): string\n {\n $payload = [\n 'round_id' => $this->requestDTO->round_id,\n 'withdraw' => $withdraw,\n 'deposit' => $deposit,\n 'bonus' => $bonus,\n ];\n if ($fundingsDetail !== []) {\n $payload['fundings'] = $fundingsDetail;\n }\n\n return json_encode($payload, JSON_UNESCAPED_UNICODE);\n }\n\n /**\n * @param array<int, array<string, int>> $fundingsDetail\n */\n private function cacheBetSplitByRound(int $withdraw, int $deposit, int $bonus, array $fundingsDetail = []): void\n {\n if ($this->requestDTO->round_id === '') {\n return;\n }\n $key = RedisKeyManagerService::getBetSplitRoundKey(\n $this->requestDTO->uid,\n $this->requestDTO->currency,\n $this->requestDTO->round_id\n );\n\n $current = Redis::get($key);\n $split = [\n 'bonus' => 0,\n 'deposit' => 0,\n 'withdraw' => 0,\n 'fundings' => [],\n ];\n if (!empty($current)) {\n $decoded = json_decode($current, true);\n if (is_array($decoded)) {\n $split['bonus'] = (int)($decoded['bonus'] ?? 0);\n $split['deposit'] = (int)($decoded['deposit'] ?? 0);\n $split['withdraw'] = (int)($decoded['withdraw'] ?? 0);\n $existFundings = $decoded['fundings'] ?? [];\n if (is_array($existFundings)) {\n $split['fundings'] = $existFundings;\n }\n }\n }\n $split['bonus'] += $bonus;\n $split['deposit'] += $deposit;\n $split['withdraw'] += $withdraw;\n foreach ($fundingsDetail as $row) {\n $split['fundings'][] = $row;\n }\n Redis::setEx($key, 86400, json_encode($split, JSON_UNESCAPED_UNICODE));\n }"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"limit":35,"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/api/logic/WalletLogic.php"}},{"type":"tool_use","name":"Read","input":{"limit":75,"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/api/dto/request/wallet/WalletUpdateRequestDTO.php"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"limit":110,"offset":168,"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/api/logic/WalletLogic.php"}},{"type":"tool_use","name":"Read","input":{"limit":100,"offset":728,"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/api/logic/WalletLogic.php"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"修正：`Withdrawable` 出资不推进任务，`wallet_bet_funding` 中对应行的 `valid_bet_amount` 应为 0（符合 PRD §3.2）。\n\n[REDACTED]"},{"type":"tool_use","name":"StrReplace","input":{"new_string":" if ($withdrawNeed > 0) {\n // Withdrawable 下注不推进 Deposit/Bonus 任务（doc §3.2），valid_bet 记 0\n $fundingRows[] = $this->makeFundingRow(\n $uid,\n $currency,\n $roundId,\n WalletBetFundingModel::FUND_TYPE_WITHDRAWABLE,\n 0,\n $withdrawNeed,\n 0\n );","old_string":" if ($withdrawNeed > 0) {\n $validBet = $this->validBetAmount($withdrawNeed, $wagerBp);\n $fundingRows[] = $this->makeFundingRow(\n $uid,\n $currency,\n $roundId,\n WalletBetFundingModel::FUND_TYPE_WITHDRAWABLE,\n 0,\n $withdrawNeed,\n $validBet\n );","path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/service/wallet/WalletBetService.php"}},{"type":"tool_use","name":"StrReplace","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/validator/Wallet2Validator.php","old_string":"<?php\n\nnamespace app\\validator;\n\nuse app\\model\\multi\\WalletLogModel;\nuse think\\Validate;\n\nclass Wallet2Validator extends Validate\n{\n public $rule = [\n 'uid' => 'require|integer',\n 'currency' => 'require',\n 'biz_id' => 'require',\n 'fee' => 'integer|checkFeeAndBonus',\n 'bonus' => 'integer',\n 'type'=>'require',\n 'source'=>'require',\n 'organization'=>'require',\n ];\n\n const SCENE_UPDATE = 'update';\n\n const SCENE_REGISTER = 'register';\n\n public $scene = [\n self::SCENE_UPDATE => ['uid', 'currency', 'biz_id','bonus', 'type', 'fee','source', 'organization'],\n self::SCENE_REGISTER => ['bonus', 'amount', ],\n ];","new_string":"<?php\n\nnamespace app\\validator;\n\nuse app\\model\\multi\\WalletLogModel;\nuse think\\Validate;\n\nclass Wallet2Validator extends Validate\n{\n public $rule = [\n 'uid' => 'require|integer',\n 'currency' => 'require',\n 'biz_id' => 'require',\n 'fee' => 'integer|checkFeeAndBonus',\n 'bonus' => 'integer',\n 'type' => 'require',\n 'source' => 'require',\n 'organization' => 'require',\n 'round_id' => 'checkBetRoundForWallet',\n 'wager_contribution_bp' => 'integer|between:0,10000',\n ];\n\n const SCENE_UPDATE = 'update';\n\n const SCENE_REGISTER = 'register';\n\n public $scene = [\n self::SCENE_UPDATE => ['uid', 'currency', 'biz_id', 'bonus', 'type', 'fee', 'source', 'organization', 'round_id', 'wager_contribution_bp'],\n self::SCENE_REGISTER => ['bonus', 'amount'],\n ];"}},{"type":"tool_use","name":"StrReplace","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/validator/Wallet2Validator.php","old_string":" public function checkFeeAndBonus($value, $rule, $data = []): bool|string\n {\n $fee = $data['fee'] ?? 0;\n $bonus = $data['bonus'] ?? 0;\n if($fee<0 || $bonus<0) return false;\n\n if ($fee>0 || $bonus>0) {\n return true;\n }\n return 'fee|bonus必须一个大于0,且不能为负数' ;\n }","new_string":" public function checkFeeAndBonus($value, $rule, $data = []): bool|string\n {\n $fee = $data['fee'] ?? 0;\n $bonus = $data['bonus'] ?? 0;\n if ($fee < 0 || $bonus < 0) {\n return false;\n }\n\n if ($fee > 0 || $bonus > 0) {\n return true;\n }\n\n return 'fee|bonus必须一个大于0,且不能为负数';\n }\n\n /**\n * doc/wallet.md：下注必须带 round_id，便于 Lot / Round 追踪与幂等\n */\n public function checkBetRoundForWallet($value, $rule, $data = []): bool|string\n {\n $type = (string)($data['type'] ?? '');\n $fee = (int)($data['fee'] ?? 0);\n if ($type === WalletLogModel::BIZ_TYPE_BET && $fee > 0) {\n $rid = isset($data['round_id']) ? trim((string)$data['round_id']) : '';\n if ($rid === '') {\n return '下注(type=bet)且 fee>0 时必须提供 round_id';\n }\n }\n\n return true;\n }"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/validator/Wallet2Validator.php"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Grep","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet","pattern":"'type'\\s*=>\\s*'bet'|\"bet\"|minus","glob":"*.php"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Grep","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet","pattern":"->minus\\(|function minus"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"StrReplace","input":{"new_string":" if ($fee > 0 && ($type === WalletLogModel::BIZ_TYPE_BET || $type === 'minus')) {\n $rid = isset($data['round_id']) ? trim((string)$data['round_id']) : '';\n if ($rid === '') {\n return '游戏扣款(bet/minus)且 fee>0 时必须提供 round_id';\n }\n }","old_string":" if ($type === WalletLogModel::BIZ_TYPE_BET && $fee > 0) {\n $rid = isset($data['round_id']) ? trim((string)$data['round_id']) : '';\n if ($rid === '') {\n return '下注(type=bet)且 fee>0 时必须提供 round_id';\n }\n }","path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/validator/Wallet2Validator.php"}},{"type":"tool_use","name":"StrReplace","input":{"new_string":" // WalletLogic::minus() 仅由 bet()/minus 调用：一律按 Lot 拆分写入 wallet_bet_funding（doc §20.3）\n if ($this->requestDTO->fee > 0) {","old_string":" if ($this->requestDTO->type === WalletLogModel::BIZ_TYPE_BET && $this->requestDTO->fee > 0) {","path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/api/logic/WalletLogic.php"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/validator/Wallet2Validator.php","offset":45,"limit":30}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"StrReplace","input":{"new_string":" $type = (string)($data['type'] ?? '');\n $fee = (int)($data['fee'] ?? 0);\n if ($fee > 0 && ($type === WalletLogModel::BIZ_TYPE_BET || $type === 'minus')) {\n $rid = isset($data['round_id']) ? trim((string)$data['round_id']) : '';\n if ($rid === '') {\n return '游戏扣款(bet/minus)且 fee>0 时必须提供 round_id';\n }\n }\n\n return true;","old_string":" $type = (string)($data['type'] ?? '');\n $fee = (int)($data['fee'] ?? 0);\n if ($fee > 0 && ($type === WalletLogModel::BIZ_TYPE_BET || $type === 'minus')) {\n $rid = isset($data['round_id']) ? trim((string)$data['round_id']) : '';\n if ($rid === '') {\n return '游戏扣款(bet/minus)且 fee>0 时必须提供 round_id';\n }\n }\n\n return true;","path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/validator/Wallet2Validator.php"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"StrReplace","input":{"new_string":"说明：\n\n- 启动前先检查 `.env` 是否配置正确。\n- `initDB` 属于高风险命令，执行前必须确认目标环境，禁止在生产环境直接试错。\n- 钱包 Lot / 下注拆分表：`php webman initDB initWalletFundLotAndBetFunding`（创建各分片上的 `wallet_fund_lot_xx`、`wallet_bet_funding_xx`，见 `app/command/InitDB.php`）。","old_string":"说明：\n\n- 启动前先检查 `.env` 是否配置正确。\n- `initDB` 属于高风险命令，执行前必须确认目标环境，禁止在生产环境直接试错。","path":"/Users/ray/Documents/project/www/ray/slot-wallet/README.md"}},{"type":"tool_use","name":"ReadLints","input":{"paths":["/Users/ray/Documents/project/www/ray/slot-wallet/app/service/wallet/WalletBetService.php","/Users/ray/Documents/project/www/ray/slot-wallet/app/model/multi/WalletFundLotModel.php","/Users/ray/Documents/project/www/ray/slot-wallet/app/model/multi/WalletBetFundingModel.php","/Users/ray/Documents/project/www/ray/slot-wallet/app/api/logic/WalletLogic.php","/Users/ray/Documents/project/www/ray/slot-wallet/app/validator/Wallet2Validator.php","/Users/ray/Documents/project/www/ray/slot-wallet/config/wallet.php"]}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"[REDACTED]"},{"type":"tool_use","name":"Read","input":{"limit":40,"offset":48,"path":"/Users/ray/Documents/project/www/ray/slot-wallet/app/validator/Wallet2Validator.php"}}]}}
|
||
{"role":"assistant","message":{"content":[{"type":"text","text":"已按 `doc/wallet.md` 在下注链路里接上 **Lot 级 FIFO 拆分、`wallet_bet_funding` 落库、`wallet_fund_lot` 的 `remaining_amount` / `current_wager`（仅 Bonus / Deposit Lot）**，并保持原有 **aggregate 三层桶扣款 + 乐观锁 + 钱包流水**。\n\n### 代码与配置\n\n| 文件 | 作用 |\n|------|------|\n| `config/wallet.php` | 默认有效投注万分比 `default_wager_contribution_bp`（可被 `wager_contribution_bp` / 环境变量覆盖） |\n| `app/model/multi/WalletFundLotModel.php` | 按 Lot 列表消费、`consume_priority_at,id` FIFO，单行乐观锁更新 |\n| `app/model/multi/WalletBetFundingModel.php` | `insertAll` 写入下注拆分 |\n| `app/service/wallet/WalletBetService.php` | 分摊：`Bonus → Locked Deposit → Withdrawable`；Withdrawable **不推高 `current_wager`**（§3.2），对应 funding 行 `valid_bet_amount = 0` |\n| `app/api/logic/WalletLogic.php` | `minus()`：**先扣 Lot → `decBalance` → 写 funding → `addLog` → `commit` → Redis**，避免事务内写缓存 |\n| `app/validator/Wallet2Validator.php` | `type` 为 `bet`/`minus` 且 `fee>0` 时必须 `round_id`；可选 `wager_contribution_bp`（0～10000） |\n| `README.md` | 补充 `initWalletFundLotAndBetFunding` 说明 |\n\nDTO 已有 `wager_contribution_bp`（0 = 使用配置）。\n\n### 行为摘要\n\n1. **扣桶顺序**：与现网一致：`frozen_bonus` → `deposit_balance` → `withdraw_balance`。 \n2. **Lot**：仅对 **实际需要 Bonus 的金额** FIFO 分摊到 **Active + `remaining_amount>0`** 的 Bonus Lot；Deposit 同理。 \n3. **仅可提现下注**：不出现 Bonus/Deposit Lot 行，只会插一条 `fund_type = Withdrawable, lot_id = 0` 的 funding。 \n4. **Redis**：在原有 `bonus/deposit/withdraw` 聚合上增加 `fundings` 数组，便于后续 Round 结算按 Lot 派奖扩展。 \n\n### 未做（下一轮可做）\n\n- **`wallet_game_round` / round_event`**：§20.3 的第 3 步未落库，仅继续在 Redis 上做回合快照；需在 `InitDB`/迁移里建表再接。 \n- **充值 / 领奖写 Lot**：若线上只有聚合余额而没有对应 **Active Bonus/Deposit Lot**，只要本次下注需要从 Bonus 或 Locked Deposit 出钱，会直接报 **Lot 不足**——需你给充值/Bonus 发放侧接上创建 `wallet_fund_lot`。\n\n### 部署前自检\n\n```bash\nphp webman initDB initWalletFundLotAndBetFunding\n```\n\n下注请求示例需在 body 中带：`type=bet`（或 `minus`）、`fee>0`、非空 **`round_id`**，可选 **`wager_contribution_bp`**（万分比，`10000` = 全额计有效投注）。\n\n[REDACTED]"}]}} |