fix(douyu): 优化供应商直充会话与任务时间索引
This commit is contained in:
@@ -54,6 +54,7 @@ import {
|
||||
hasBindQrcode,
|
||||
hasPaymentQrcode,
|
||||
paymentArrived,
|
||||
isSupplierApiRechargeTask,
|
||||
bindPhaseText,
|
||||
goodsLabel,
|
||||
xpdGoodsLabel,
|
||||
@@ -84,6 +85,7 @@ interface DouyuPaySessionView {
|
||||
doneCount: number;
|
||||
errorCount: number;
|
||||
active: boolean;
|
||||
supplierApi: boolean;
|
||||
}
|
||||
|
||||
function parseAccountNames(text: string): string[] {
|
||||
@@ -785,6 +787,7 @@ export default function DouyuTasksPage({ handbook }: { handbook: HandbookKind })
|
||||
message.warning('该充值批次属于其他用户,请在自己的充值会话中操作');
|
||||
return;
|
||||
}
|
||||
if (isSupplierApiRechargeTask(ownerTask)) return;
|
||||
const ordered = [...batchTasks].sort((a, b) => a.id - b.id);
|
||||
addPaySession({
|
||||
batchId,
|
||||
@@ -1000,7 +1003,10 @@ export default function DouyuTasksPage({ handbook }: { handbook: HandbookKind })
|
||||
});
|
||||
// 只有本页面创建的批次才允许主动弹二维码,防止其他工作台/浏览器的任务打扰当前操作。
|
||||
locallyStartedBatchIds.current.add(result.batch_id);
|
||||
if (DOUYU_PAYMENT_TASK_TYPE_SET.has(taskType)) {
|
||||
if (
|
||||
DOUYU_PAYMENT_TASK_TYPE_SET.has(taskType)
|
||||
&& !(taskType === 'create_gold_qr' && goldRechargeChannel === 'supplier_api')
|
||||
) {
|
||||
addPaySession({
|
||||
batchId: result.batch_id,
|
||||
taskType,
|
||||
@@ -1901,6 +1907,10 @@ export default function DouyuTasksPage({ handbook }: { handbook: HandbookKind })
|
||||
for (const task of batchTasks.sort((a, b) => a.id - b.id)) {
|
||||
taskByAccount.set(task.account_id, task);
|
||||
}
|
||||
const supplierApi = (
|
||||
batchTasks.length > 0
|
||||
&& batchTasks.every((task) => isSupplierApiRechargeTask(task))
|
||||
);
|
||||
const accountIds = [
|
||||
...session.accountIds,
|
||||
...Array.from(taskByAccount.keys()).filter(
|
||||
@@ -2030,6 +2040,7 @@ export default function DouyuTasksPage({ handbook }: { handbook: HandbookKind })
|
||||
doneCount,
|
||||
errorCount,
|
||||
active,
|
||||
supplierApi,
|
||||
};
|
||||
})
|
||||
), [
|
||||
@@ -2040,9 +2051,63 @@ export default function DouyuTasksPage({ handbook }: { handbook: HandbookKind })
|
||||
runningBatchIds,
|
||||
tasks,
|
||||
]);
|
||||
const activePaySessionView = paySessionViews.find(
|
||||
const visiblePaySessionViews = useMemo(
|
||||
() => paySessionViews.filter((view) => (
|
||||
!view.supplierApi
|
||||
&& !(
|
||||
view.doneCount > 0
|
||||
&& view.doneCount === view.session.accountIds.length
|
||||
&& view.items.length === 0
|
||||
)
|
||||
)),
|
||||
[paySessionViews],
|
||||
);
|
||||
useEffect(() => {
|
||||
const removable = new Set(
|
||||
paySessionViews
|
||||
.filter((view) => (
|
||||
view.supplierApi
|
||||
|| (
|
||||
view.doneCount > 0
|
||||
&& view.doneCount === view.session.accountIds.length
|
||||
&& view.items.length === 0
|
||||
)
|
||||
))
|
||||
.map((view) => view.session.batchId),
|
||||
);
|
||||
if (removable.size === 0) return;
|
||||
setPaySessionsSafely((sessions) => {
|
||||
const next = sessions.filter(
|
||||
(session) => !removable.has(session.batchId),
|
||||
);
|
||||
return next.length === sessions.length ? sessions : next;
|
||||
});
|
||||
setPaySessionTasks((current) => {
|
||||
const next = { ...current };
|
||||
let changed = false;
|
||||
removable.forEach((batchId) => {
|
||||
if (!(batchId in next)) return;
|
||||
delete next[batchId];
|
||||
changed = true;
|
||||
});
|
||||
return changed ? next : current;
|
||||
});
|
||||
setActivePayBatchId((current) => (
|
||||
current && removable.has(current) ? null : current
|
||||
));
|
||||
}, [paySessionViews, setPaySessionsSafely]);
|
||||
useEffect(() => {
|
||||
if (
|
||||
payOpen
|
||||
&& paySessions.length > 0
|
||||
&& visiblePaySessionViews.length === 0
|
||||
) {
|
||||
setPayOpen(false);
|
||||
}
|
||||
}, [payOpen, paySessions.length, visiblePaySessionViews.length]);
|
||||
const activePaySessionView = visiblePaySessionViews.find(
|
||||
(view) => view.session.batchId === activePayBatchId,
|
||||
) || paySessionViews[0];
|
||||
) || visiblePaySessionViews[0];
|
||||
const payReadyCount = activePaySessionView?.readyCount || 0;
|
||||
const payQueuedCount = activePaySessionView?.queuedCount || 0;
|
||||
const payDoneCount = activePaySessionView?.doneCount || 0;
|
||||
@@ -2051,6 +2116,32 @@ export default function DouyuTasksPage({ handbook }: { handbook: HandbookKind })
|
||||
activePaySessionView
|
||||
&& activePaySessionView.session.ownerUserId === user?.id,
|
||||
);
|
||||
const historicalPaySessionIds = useMemo(
|
||||
() => paySessionViews
|
||||
.filter((view) => (
|
||||
!view.active
|
||||
&& !view.items.some((item) => item.phase === 'ready')
|
||||
))
|
||||
.map((view) => view.session.batchId),
|
||||
[paySessionViews],
|
||||
);
|
||||
const clearHistoricalPaySessions = () => {
|
||||
if (historicalPaySessionIds.length === 0) return;
|
||||
const remove = new Set(historicalPaySessionIds);
|
||||
const remaining = paySessionsRef.current.filter(
|
||||
(session) => !remove.has(session.batchId),
|
||||
);
|
||||
setPaySessionsSafely((sessions) => sessions.filter(
|
||||
(session) => !remove.has(session.batchId),
|
||||
));
|
||||
setPaySessionTasks((current) => {
|
||||
const next = { ...current };
|
||||
remove.forEach((batchId) => delete next[batchId]);
|
||||
return next;
|
||||
});
|
||||
setActivePayBatchId(remaining[0]?.batchId || null);
|
||||
if (remaining.length === 0) setPayOpen(false);
|
||||
};
|
||||
const zoomPayUrl = taskQrUrl(zoomPayTask);
|
||||
const copyPaymentLink = async (value: string) => {
|
||||
if (!value) {
|
||||
@@ -3024,6 +3115,12 @@ export default function DouyuTasksPage({ handbook }: { handbook: HandbookKind })
|
||||
</Button>
|
||||
</Popconfirm>
|
||||
)}
|
||||
<Button
|
||||
onClick={clearHistoricalPaySessions}
|
||||
disabled={historicalPaySessionIds.length === 0}
|
||||
>
|
||||
清理历史会话
|
||||
</Button>
|
||||
<Button onClick={closeActivePaySession} disabled={!activePaySessionView}>
|
||||
关闭当前会话
|
||||
</Button>
|
||||
@@ -3032,14 +3129,14 @@ export default function DouyuTasksPage({ handbook }: { handbook: HandbookKind })
|
||||
centered
|
||||
width={920}
|
||||
>
|
||||
{paySessionViews.length > 0 ? (
|
||||
{visiblePaySessionViews.length > 0 ? (
|
||||
<Tabs
|
||||
activeKey={activePaySessionView?.session.batchId}
|
||||
onChange={(batchId) => {
|
||||
setActivePayBatchId(batchId);
|
||||
void loadPaySessionTasks([batchId]);
|
||||
}}
|
||||
items={paySessionViews.map((view) => ({
|
||||
items={visiblePaySessionViews.map((view) => ({
|
||||
key: view.session.batchId,
|
||||
label: (
|
||||
<Space size={4}>
|
||||
|
||||
@@ -208,8 +208,19 @@ export function hasPaymentQrcode(task: DouyuTaskItem | null | undefined): boolea
|
||||
);
|
||||
}
|
||||
|
||||
export function isSupplierApiRechargeTask(
|
||||
task: DouyuTaskItem | null | undefined,
|
||||
): boolean {
|
||||
return Boolean(
|
||||
task
|
||||
&& task.task_type === 'create_gold_qr'
|
||||
&& resultText(task.result, 'recharge_channel') === 'supplier_api',
|
||||
);
|
||||
}
|
||||
|
||||
export function paymentArrived(task: DouyuTaskItem | null | undefined): boolean {
|
||||
if (!task || !DOUYU_PAYMENT_TASK_TYPE_SET.has(task.task_type)) return false;
|
||||
if (isSupplierApiRechargeTask(task) && task.status === 'success') return true;
|
||||
if (task.status !== 'success') return false;
|
||||
return task.result?.gold_recharged === true
|
||||
|| task.result?.elite_opened === true
|
||||
|
||||
Reference in New Issue
Block a user