fix(douyu): 补齐成功后刷新和精英宝典批量选择

This commit is contained in:
yml
2026-11-21 14:54:36 +08:00
parent 7396126c73
commit d199e04d27
8 changed files with 103 additions and 3 deletions
+2 -1
View File
@@ -44,6 +44,7 @@ data/captcha_captures/
**/node_modules/
web/frontend/dist/
.DS_Store
AGENTS.md
.reasonix/
.tmp_reverse/
apks/
@@ -53,4 +54,4 @@ analysis/
artifacts/
hars/
hars/
+7
View File
@@ -197,7 +197,14 @@ docker compose logs douyu-login | grep '确认前状态'
- 支付码:`/japi/oms/web/pay/getQrCode`
- 供应商鱼翅直充按供应商协议执行;到账必须核对斗鱼余额相对下单前基线增加,
供应商长期“待处理”不能覆盖实际到账事实。
- 供应商 API 返回成功时,执行器会再次调用鱼翅余额查询,任务结果写入
`gold_refreshed_after_success=true`;刷新失败不回滚已经成功的充值终态。
- 支付任务只负责出码和记录基线,到账轮询进入 `payment_poll` 独立任务槽。
- 精英宝典开通成功后必须再次刷新积分,任务结果写入
`points_refreshed_after_elite_opened=true`。
- 赠送精英令成功后必须短轮询积分到账,任务结果写入
`points_refreshed_after_gift=true`;未达到预期积分时保留
`gift_points_confirmed=false`。
## 电竞手册、和平小店与送礼
+28 -1
View File
@@ -240,7 +240,7 @@ class TestEliteHandbookOpenFlow:
runner._client = Mock(return_value=client)
# 第一次是开通前的基线 0,之后轮询到账 300
runner._refresh_account_points = Mock(
side_effect=[{"points": 0}, {"points": 300}]
side_effect=[{"points": 0}, {"points": 300}, {"points": 300}]
)
runner._execute_create_elite_qr(
@@ -262,7 +262,9 @@ class TestEliteHandbookOpenFlow:
self.session.refresh(self.account)
assert task.status == "success"
assert task.result["elite_opened"] is True
assert task.result["points_refreshed_after_elite_opened"] is True
assert self.account.elite_opened is True
assert runner._refresh_account_points.call_count == 3
def test_poll_points_falls_back_without_baseline(self):
"""拿不到基线时退回旧口径,避免完全无法判定到账。"""
@@ -285,6 +287,7 @@ class TestEliteHandbookOpenFlow:
self.session.refresh(task)
assert task.status == "success"
assert task.result["elite_opened"] is True
assert task.result["points_refreshed_after_elite_opened"] is True
@pytest.mark.parametrize("already_points", [300, 680])
def test_poll_points_ignores_existing_points(self, already_points):
@@ -311,6 +314,30 @@ class TestEliteHandbookOpenFlow:
assert task.status == "running"
assert task.queue_lane == "payment_poll"
def test_elite_gift_refreshes_points_and_marks_result(self):
task = self._task("donate_elite_gift")
runner = self._runner("donate_elite_gift")
runner._refresh_account_points = Mock(
return_value={"points": 310, "points_query": {"points": 310}}
)
result: dict = {}
runner._refresh_points_after_elite_gift(
self.session,
task,
self.account,
Mock(),
"acf_uid=100",
"ctn",
result,
300,
1,
)
assert result["points_refreshed_after_gift"] is True
assert result["gift_points_confirmed"] is True
assert result["gift_points_refresh_count"] == 1
def test_esports_qr_schedules_and_poll_completes_after_open(self):
task = self._task("create_esports_qr")
runner = self._runner("create_esports_qr")
@@ -194,6 +194,8 @@ class TestDouyuGoldRechargeChannel:
assert task_result["douyu_uid"] == "10001"
assert task_result["order_id"] == "supplier-001"
assert task_result["pay_amount"] == "10"
assert task_result["gold_refreshed_after_success"] is True
assert self.runner._refresh_account_gold_balance.call_count == 2
assert "pay_url" not in task_result
assert "sign" not in task_result["supplier_order"]
@@ -277,6 +279,7 @@ class TestDouyuGoldRechargeChannel:
assert self.task.queue_lane == ""
assert self.task.result["supplier_order_status"] == 0
assert self.task.result["supplier_balance_confirmed"] is True
assert self.task.result["gold_refreshed_after_success"] is True
def test_supplier_out_order_id_reuses_persisted_value(self):
self.task.supplier_out_order_id = "DYGFHISTORICAL-001"
@@ -74,6 +74,7 @@ class DonateMixin:
last_points = refresh_result["points"]
result.update(refresh_result)
result["gift_points_refresh_count"] = index
result["points_refreshed_after_gift"] = True
if target_points is None or (
last_points is not None and last_points >= target_points
):
@@ -93,6 +94,7 @@ class DonateMixin:
break
result["gift_points_confirmed"] = False
result["points_refreshed_after_gift"] = last_points is not None
result["points"] = last_points
return refresh_result
@@ -310,6 +312,7 @@ class DonateMixin:
)
except Exception as exc: # noqa: BLE001 外部接口与任务边界需要保留宽泛异常兜底
refresh_errors.append(f"积分: {exc}")
result["points_refreshed_after_gift"] = False
if refresh_errors:
result["refresh_errors"] = refresh_errors
account.updated_at = datetime.now(UTC)
+26
View File
@@ -302,6 +302,8 @@ class GoldMixin:
amount=amount,
status=2,
balance_confirmed=True,
cookie=cookie,
gold_already_refreshed=bool(gold_result),
)
return
if supplier_error:
@@ -331,6 +333,8 @@ class GoldMixin:
result,
amount=amount,
status=status,
cookie=cookie,
gold_already_refreshed=bool(gold_result),
)
return
if gold_error:
@@ -356,8 +360,29 @@ class GoldMixin:
amount: int,
status: int | None,
balance_confirmed: bool = False,
cookie: str | None = None,
gold_already_refreshed: bool = False,
) -> None:
if status == 2 or balance_confirmed:
refreshed_after_success = balance_confirmed or gold_already_refreshed
if status == 2 and not refreshed_after_success and cookie:
try:
result.update(
self._refresh_account_gold_balance(
self._client(cookie, direct=True),
account,
)
)
refreshed_after_success = True
self._push_log(
"info",
"供应商直充成功,已刷新鱼翅余额: "
f"{account.gold_balance if account.gold_balance is not None else '-'}",
)
except Exception as exc: # noqa: BLE001 充值成功后刷新失败不翻盘
result["gold_refresh_after_success_error"] = str(exc)
self._push_log("warning", f"供应商直充成功后刷新鱼翅失败: {exc}")
result["gold_refreshed_after_success"] = refreshed_after_success
account.updated_at = datetime.now(UTC)
record_recharge(
db,
@@ -573,6 +598,7 @@ class GoldMixin:
result,
amount=amount,
status=status,
cookie=cookie,
)
return
self._schedule_payment_poll(
@@ -174,6 +174,23 @@ class ManualMixin:
result["payment_polling"] = False
result["elite_opened"] = True
account.elite_opened = True
# 到账判定本身已经调用过积分接口;成功后再收口一次,确保任务结果
# 和账号积分反映的是开通完成后的最终值。
try:
final_points = self._refresh_account_points(
client, account, cookie, ctn=ctn
)
result.update(final_points)
result["points_refreshed_after_elite_opened"] = True
self._push_log(
"info",
"精英宝典开通成功,已刷新积分: "
f"{account.points if account.points is not None else '-'}",
)
except Exception as exc: # noqa: BLE001 开通成功后刷新失败不翻盘
result["points_refreshed_after_elite_opened"] = False
result["elite_open_points_refresh_error"] = str(exc)
self._push_log("warning", f"精英宝典开通后刷新积分失败: {exc}")
account.updated_at = datetime.now(UTC)
spent = _points_spent(baseline_points, account.points)
emit(
+17 -1
View File
@@ -591,6 +591,22 @@ export default function HuyaElitePage() {
const value = search.trim().toLowerCase();
return accounts.filter((item) => !value || [item.uid, item.nickname, item.username, item.tag, item.game_name, item.game_phone].some((v) => String(v || '').toLowerCase().includes(value)));
}, [accounts, search]);
const currentPageIds = useMemo(() => {
const start = (currentPage - 1) * pageSize;
return filteredAccounts.slice(start, start + pageSize).map((item) => item.id);
}, [currentPage, filteredAccounts, pageSize]);
const selectCurrentPage = () => {
setSelectedIds((prev) => Array.from(new Set([...prev, ...currentPageIds])));
};
const invertCurrentPage = () => {
setSelectedIds((prev) => {
const selected = new Set(prev);
const page = new Set(currentPageIds);
const kept = prev.filter((id) => !page.has(id));
const added = currentPageIds.filter((id) => !selected.has(id));
return [...kept, ...added];
});
};
useEffect(() => {
const totalPages = Math.max(1, Math.ceil(filteredAccounts.length / pageSize));
if (currentPage > totalPages) setCurrentPage(totalPages);
@@ -866,7 +882,7 @@ export default function HuyaElitePage() {
</Space>
);
const accountsBody = <><Space style={{ marginBottom: 8, width: '100%', justifyContent: 'space-between' }} wrap><Input size="small" allowClear prefix={<SearchOutlined />} placeholder="搜索账号/昵称/游戏名/手机号" value={search} onChange={(event) => { setSearch(event.target.value); setCurrentPage(1); }} style={{ width: 240 }} /><Space><Button size="small" icon={<ImportOutlined />} onClick={() => setImportOpen(true)}>导入账号</Button>{canImport && <Button size="small" icon={<ImportOutlined />} onClick={() => setCkImportOpen(true)}>导入外部 CK</Button>}{selectedIds.length > 0 && <Button size="small" danger onClick={() => void saveAccounts(accounts.map((item) => item.id).filter((id) => !selectedIds.includes(id)))}>移出选中</Button>}{canTransferCollab && selectedIds.length === 1 && <Button size="small" icon={<SwapOutlined />} loading={transferring} onClick={() => void transferToCollab()}>转入外部单协作</Button>}</Space></Space><div className="huya-account-table"><Table rowKey="id" size="small" loading={loading} tableLayout="fixed" rowSelection={{ selectedRowKeys: selectedIds, onChange: (keys) => setSelectedIds(keys.map(Number)), preserveSelectedRowKeys: true }} columns={accountColumns} dataSource={filteredAccounts} locale={{ emptyText: '工作台暂无账号,点击右上角「导入账号」添加' }} pagination={{ current: currentPage, pageSize, total: filteredAccounts.length, showSizeChanger: true, showTotal: (total) => `共 ${total} 条`, onChange: (page, size) => { setCurrentPage(page); if (size !== pageSize) { setPageSize(size); localStorage.setItem(PAGE_SIZE_KEY, String(size)); setCurrentPage(1); } } }} scroll={{ y: 'calc(100vh - 300px)' }} onRow={(row) => ({ onClick: () => { const task = latestTask(tasks, row.id); if (!task?.result) return; if (task.task_type === 'get_bind_qr') void openQrTask(task); else if (task.task_type === 'query_exchange_records' && taskResultRecords(task).length > 0) setRecordsTask(task); else if (['create_recharge_order', 'exchange_goods'].includes(task.task_type)) openPayTasks(task.batch_id); }, onContextMenu: (event) => handleRowContextMenu(row, event), style: { cursor: 'context-menu' }, title: '右键打开账号动作' })} /></div></>;
const accountsBody = <><Space style={{ marginBottom: 8, width: '100%', justifyContent: 'space-between' }} wrap><Input size="small" allowClear prefix={<SearchOutlined />} placeholder="搜索账号/昵称/游戏名/手机号" value={search} onChange={(event) => { setSearch(event.target.value); setCurrentPage(1); }} style={{ width: 240 }} /><Space><Button size="small" onClick={selectCurrentPage} disabled={!currentPageIds.length}>全选本页</Button><Button size="small" onClick={invertCurrentPage} disabled={!currentPageIds.length}>反选本页</Button><Button size="small" onClick={() => setSelectedIds([])} disabled={!selectedIds.length}>清空选择</Button><Button size="small" icon={<ImportOutlined />} onClick={() => setImportOpen(true)}>导入账号</Button>{canImport && <Button size="small" icon={<ImportOutlined />} onClick={() => setCkImportOpen(true)}>导入外部 CK</Button>}{selectedIds.length > 0 && <Button size="small" danger onClick={() => void saveAccounts(accounts.map((item) => item.id).filter((id) => !selectedIds.includes(id)))}>移出选中</Button>}{canTransferCollab && selectedIds.length === 1 && <Button size="small" icon={<SwapOutlined />} loading={transferring} onClick={() => void transferToCollab()}>转入外部单协作</Button>}</Space></Space><div className="huya-account-table"><Table rowKey="id" size="small" loading={loading} tableLayout="fixed" rowSelection={{ selectedRowKeys: selectedIds, onChange: (keys) => setSelectedIds(keys.map(Number)), preserveSelectedRowKeys: true }} columns={accountColumns} dataSource={filteredAccounts} locale={{ emptyText: '工作台暂无账号,点击右上角「导入账号」添加' }} pagination={{ current: currentPage, pageSize, total: filteredAccounts.length, showSizeChanger: true, showTotal: (total) => `共 ${total} 条`, onChange: (page, size) => { setCurrentPage(page); if (size !== pageSize) { setPageSize(size); localStorage.setItem(PAGE_SIZE_KEY, String(size)); setCurrentPage(1); } } }} scroll={{ y: 'calc(100vh - 300px)' }} onRow={(row) => ({ onClick: () => { const task = latestTask(tasks, row.id); if (!task?.result) return; if (task.task_type === 'get_bind_qr') void openQrTask(task); else if (task.task_type === 'query_exchange_records' && taskResultRecords(task).length > 0) setRecordsTask(task); else if (['create_recharge_order', 'exchange_goods'].includes(task.task_type)) openPayTasks(task.batch_id); }, onContextMenu: (event) => handleRowContextMenu(row, event), style: { cursor: 'context-menu' }, title: '右键打开账号动作' })} /></div></>;
const contextMenuStyle = contextMenu ? {
position: 'fixed' as const,