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
@@ -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,