feat(pool): 账号自动分配与回收(租约 + 补给链 + 独立工作台)
在既有「管理员分配 → 客服导入工作台 → 手动选号」之外**新增**一条 「客服选皮肤 + 数量 → 系统分配账号 + 按需补积分 → 用完自动收回」的路径。 旧路径只做并集与可选参数扩展,行为不变(有用例守着)。 - 归属与使用权分离:新增 account_leases(生成列 + 唯一索引,并发抢号由数据库裁决), assigned_to 收窄为管理员/运营的维护责任;客服可见范围扩为「名下 ∪ 租用中」 - account_pool 服务:候选筛选、两梯队排序(先花快过期的 / 先选充值少的)、 供给与成本预估、租约领取/释放/回收 - 补给链:查余额 → 充鱼翅(单次 ≤800 元,超限拆单)→ 赠精英令 → 兑换; 运行期两道闸门:_skip_when(余额已够就别再花钱)、_depends_on(前置未成功就跳过) - 转人工:鱼翅支付等 10 分钟未到账转 manual_required,租约先不还; account_lease_reaper 兜 TTL 到期 / 漏释放 / 孤儿批次 - 运营流水:业务事件补 actor_id = task.created_by;账号详情页展示操作人、渠道 与租赁记录 - 新工作台:/douyu/pool + 菜单「账号分配台」(新建,不改造旧工作台) - 修复 D1:官方补录的兑换事件漏写 subject_key(10,612 条主键为空), 会让 365 天同皮肤规则漏判 87% 的历史;补代码 + 回填脚本 - 迁移 20261007_0052;权限 account:pool_use / account:pool_admin 测试:766 passed, 6 skipped(改动前基线 727);ruff 与 tsc -b 干净。 设计稿与实施记录:docs/设计-账号自动分配与回收.md
This commit is contained in:
@@ -1031,6 +1031,62 @@ class TestOfficialExchangeBecomesAccountEvent:
|
||||
assert event.detail["source"] == "official_sync"
|
||||
assert event.source == "official_sync"
|
||||
|
||||
def test_subject_key_is_commodity_id(self):
|
||||
"""D1:官方补录的事件必须写 `subject_key=商品ID`。
|
||||
|
||||
2026-10-07 实测:生产 10,612 条 `official_sync` 事件的 `subject_key`
|
||||
**全是空串**(`record_official_exchange` 漏传),而 365 天同皮肤规则与
|
||||
`ix_account_events_ledger` 都按 `subject_key` 判定 —— 不修会漏掉 87% 的历史。
|
||||
|
||||
断言直接查 **DB 行**(不是只看返回值),并顺带确认 `subject_type`
|
||||
与 `record_exchange`(我方任务直发)统一为 `commodity`。
|
||||
"""
|
||||
from web.backend.services import account_events_service as svc
|
||||
|
||||
assert self._record(commodity_id="20260120QYOOB_bag10") is True
|
||||
self.session.commit()
|
||||
event = (
|
||||
self.session.query(AccountEvent)
|
||||
.filter(AccountEvent.event_type == svc.EVENT_EXCHANGE)
|
||||
.one()
|
||||
)
|
||||
assert event.subject_key == "20260120QYOOB_bag10", (
|
||||
"365 天规则按 subject_key 查;这里为空等于查不到历史"
|
||||
)
|
||||
assert event.subject_type == "commodity"
|
||||
|
||||
def test_subject_key_makes_365d_lookup_work(self):
|
||||
"""按 `subject_key` 能查到、按空串查不到(反向验证 D1)。
|
||||
|
||||
`subject_key` 一旦再次漏写,这条与上面那条都会变红。
|
||||
"""
|
||||
from web.backend.services import account_events_service as svc
|
||||
|
||||
assert self._record(commodity_id="20260120QYOOB_bag10") is True
|
||||
self.session.commit()
|
||||
hit = (
|
||||
self.session.query(AccountEvent)
|
||||
.filter(
|
||||
AccountEvent.account_id == self.account.id,
|
||||
AccountEvent.event_type == svc.EVENT_EXCHANGE,
|
||||
AccountEvent.source == svc.OFFICIAL_SYNC_SOURCE,
|
||||
AccountEvent.subject_key == "20260120QYOOB_bag10",
|
||||
)
|
||||
.count()
|
||||
)
|
||||
assert hit == 1
|
||||
empty = (
|
||||
self.session.query(AccountEvent)
|
||||
.filter(
|
||||
AccountEvent.account_id == self.account.id,
|
||||
AccountEvent.event_type == svc.EVENT_EXCHANGE,
|
||||
AccountEvent.source == svc.OFFICIAL_SYNC_SOURCE,
|
||||
AccountEvent.subject_key == "",
|
||||
)
|
||||
.count()
|
||||
)
|
||||
assert empty == 0
|
||||
|
||||
def test_is_idempotent(self):
|
||||
"""一键查询会被反复执行,同一条官方记录只能落一条事件。"""
|
||||
from web.backend.services import account_events_service as svc
|
||||
|
||||
Reference in New Issue
Block a user