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:
@@ -850,6 +850,64 @@ class DouyuWorkbenchAccountsUpdate(BaseModel):
|
||||
account_ids: list[int] = Field(default_factory=list)
|
||||
|
||||
|
||||
class DouyuPoolExchangeRequest(BaseModel):
|
||||
"""账号池:客服选皮肤 + 数量,由系统分配账号。
|
||||
|
||||
- `quantity` 是**账号个数**(一期一账号一件,`num=1`);
|
||||
- `allow_topup=True` 时积分不足的账号也会入选,并按缺口自动充值积分;
|
||||
- `allow_fallback=True` 时某个账号执行失败(已达上限/无库存等)会自动补位。
|
||||
"""
|
||||
|
||||
scope: str = Field("elite", pattern="^(elite|esports)$")
|
||||
commodity_id: str = Field(..., min_length=1, max_length=64)
|
||||
quantity: int = Field(1, ge=1, le=50)
|
||||
allow_topup: bool = True
|
||||
allow_fallback: bool = False
|
||||
|
||||
|
||||
class DouyuPoolAccountOut(BaseModel):
|
||||
account_id: int
|
||||
username: str = ""
|
||||
# A = 积分已够(免充值);B = 需要充值
|
||||
tier: str = "A"
|
||||
points: int = 0
|
||||
topup_gifts: int = 0
|
||||
# 需要充多少元(1 元 = 1 鱼翅 = 1 精英令)
|
||||
topup_yuan: int = 0
|
||||
# 充值订单金额列表(每笔 ≤ 800 元);空 = 不需要充值
|
||||
recharge_orders: list[int] = Field(default_factory=list)
|
||||
# 该账号何时可以换绑游戏角色(只提示,不做候选过滤)
|
||||
role_change_available_at: str | None = None
|
||||
|
||||
|
||||
class DouyuPoolExchangeResponse(BaseModel):
|
||||
batch_id: str = ""
|
||||
requested: int = 0
|
||||
allocated: int = 0
|
||||
shortfall: int = 0
|
||||
accounts: list[DouyuPoolAccountOut] = Field(default_factory=list)
|
||||
reasons: list[str] = Field(default_factory=list)
|
||||
# 当前鱼翅充值渠道(**只读回显**,让客服提交前就知道要不要去扫码)
|
||||
recharge_channel: str = ""
|
||||
manual_payment_required: bool = False
|
||||
|
||||
|
||||
class DouyuPoolLeaseOut(BaseModel):
|
||||
id: int
|
||||
account_id: int
|
||||
username: str = ""
|
||||
holder_user_id: int = 0
|
||||
holder_name: str = ""
|
||||
scope: str = ""
|
||||
commodity_id: str = ""
|
||||
batch_id: str = ""
|
||||
status: str = ""
|
||||
leased_at: str | None = None
|
||||
expires_at: str | None = None
|
||||
role_change_available_at: str | None = None
|
||||
points: int | None = None
|
||||
|
||||
|
||||
class DouyuTaskOut(BaseModel):
|
||||
id: int
|
||||
batch_id: str
|
||||
|
||||
Reference in New Issue
Block a user