feat(huya): 开通支付码多选账号时每个账号各出一个码并排展示
多选账号点「生成开通支付码」只出一个码:create_planned_tasks 把 create_recharge_order 也当成单笔任务(accounts[:1]),前端本来就支持多码并排,是被后端截断的。 - 后端:create_planned_tasks 不再截断 create_recharge_order(refresh_* 仍只建一个,商品快照是全局的),N 个账号 = N 个支付码任务,各自独立下单/监听支付 - 前端:支付码任务的并发取 min(10, max(并发, 账号数)),否则超出并发的码要等前面的码付完/超时才生成 - 前端:支付弹窗改成网格并排展示多个 150px 码,标题显示待扫码数;新增「生成失败(没有二维码)」点名区和「还有 N 个账号在排队生成」提示 - 前端:去掉每个码回包就自动弹支付弹窗的行为(多选时会反复把弹窗顶到最前);不做付完自动跳转 - 测试:多账号生成支付码 → 每账号一个任务,refresh_recharge_goods 仍单任务
This commit is contained in:
@@ -1,7 +1,13 @@
|
||||
import pytest
|
||||
|
||||
from tests.support.db import get_test_engine, make_test_session
|
||||
from web.backend.models import HuyaAccount, HuyaWorkbench, HuyaWorkbenchAccount, User
|
||||
from web.backend.models import (
|
||||
HuyaAccount,
|
||||
HuyaTask,
|
||||
HuyaWorkbench,
|
||||
HuyaWorkbenchAccount,
|
||||
User,
|
||||
)
|
||||
from web.backend.routers.huya import (
|
||||
delete_account,
|
||||
list_huya_account_ids,
|
||||
@@ -108,6 +114,47 @@ class TestHuyaWorkbenchScope:
|
||||
)
|
||||
assert searched["account_ids"] == [no_cookie.id]
|
||||
|
||||
def test_recharge_order_tasks_created_for_every_account(self):
|
||||
"""多选账号生成支付码:每个账号一个任务(一个账号一张码,各自监听支付)。
|
||||
|
||||
商品快照类任务(refresh_*)仍然是全局的,多选也只建一个。
|
||||
"""
|
||||
other = HuyaAccount(uid="300", yyuid="300", cookie="yyuid=300; udb_uid=300")
|
||||
self.session.add(other)
|
||||
self.session.commit()
|
||||
account_ids = [self.account.id, other.id]
|
||||
|
||||
batch_id, count = create_planned_tasks(
|
||||
self.session,
|
||||
account_ids,
|
||||
"create_recharge_order",
|
||||
self.user.id,
|
||||
payload={"spu_id": "hy-8328015"},
|
||||
handbook_scope="elite",
|
||||
)
|
||||
|
||||
assert count == 2
|
||||
tasks = self.session.query(HuyaTask).filter(HuyaTask.batch_id == batch_id).all()
|
||||
assert len(tasks) == 2
|
||||
# 每个选中的账号都拿到一个码,而不是只有第一个
|
||||
assert sorted(task.account_id for task in tasks) == sorted(account_ids)
|
||||
assert {task.task_type for task in tasks} == {"create_recharge_order"}
|
||||
|
||||
snapshot_batch, snapshot_count = create_planned_tasks(
|
||||
self.session,
|
||||
account_ids,
|
||||
"refresh_recharge_goods",
|
||||
self.user.id,
|
||||
handbook_scope="elite",
|
||||
)
|
||||
assert snapshot_count == 1
|
||||
assert (
|
||||
self.session.query(HuyaTask)
|
||||
.filter(HuyaTask.batch_id == snapshot_batch)
|
||||
.count()
|
||||
== 1
|
||||
)
|
||||
|
||||
def test_account_delete_cleans_workbench_membership(self):
|
||||
self.session.add(
|
||||
HuyaWorkbenchAccount(
|
||||
|
||||
Reference in New Issue
Block a user