From 38155ca1c3ad055b2fd986284446c7ed294b31f8 Mon Sep 17 00:00:00 2001 From: yml Date: Fri, 20 Nov 2026 22:03:20 +0800 Subject: [PATCH] =?UTF-8?q?fix(douyu):=20=E4=BF=AE=E6=AD=A3=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E5=88=B7=E6=96=B0=E4=B8=8E=E8=87=AA=E5=8A=A8=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E4=BA=A4=E4=BA=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/backend/src/routes/douyu-fulfillment.ts | 10 ++++ .../douyu-fulfillment-service.ts | 28 ++++++++- .../DouyuFulfillmentPage.tsx | 60 ++++++++----------- .../src/services/douyu-fulfillment.ts | 7 +++ apps/frontend/src/types/douyu-fulfillment.ts | 4 ++ .../tests/douyu-fulfillment-refresh.test.ts | 39 ++++++++++++ docs/斗鱼客户领取与角色绑定.md | 18 +++++- 7 files changed, 128 insertions(+), 38 deletions(-) create mode 100644 apps/frontend/tests/douyu-fulfillment-refresh.test.ts diff --git a/apps/backend/src/routes/douyu-fulfillment.ts b/apps/backend/src/routes/douyu-fulfillment.ts index ad14d767..74665069 100644 --- a/apps/backend/src/routes/douyu-fulfillment.ts +++ b/apps/backend/src/routes/douyu-fulfillment.ts @@ -4,6 +4,7 @@ import { confirmDouyuCustomerBinding, getDouyuCustomerFulfillmentCached, getCustomerDouyuFulfillment, + refreshDouyuCustomerBinding, saveDouyuCustomerProfile, startDouyuCustomerBinding, } from '../services/douyu-fulfillment/douyu-fulfillment-service.js' @@ -61,6 +62,15 @@ router.get( }), ) +router.post( + '/:orderNo/binding/refresh', + createRouteHandler((req) => refreshDouyuCustomerBinding(String(req.params.orderNo || '')), { + successMessage: '绑定状态已刷新', + errorMessage: '刷新绑定状态失败', + scope: '[douyu-fulfillment/:orderNo/binding/refresh]', + }), +) + router.post( '/:orderNo/binding/confirm', createRouteHandler((req) => confirmDouyuCustomerBinding(String(req.params.orderNo || '')), { diff --git a/apps/backend/src/services/douyu-fulfillment/douyu-fulfillment-service.ts b/apps/backend/src/services/douyu-fulfillment/douyu-fulfillment-service.ts index f8d0b96b..894de2d8 100644 --- a/apps/backend/src/services/douyu-fulfillment/douyu-fulfillment-service.ts +++ b/apps/backend/src/services/douyu-fulfillment/douyu-fulfillment-service.ts @@ -76,6 +76,10 @@ type LiveBindingState = { platName: string bindReadyForConfirm: boolean bindConfirmed: boolean + queueState?: string + retryAfterMs?: number + queueLane?: string + accepted?: boolean customerProfileReset?: boolean resetReason?: string stateVersion?: number | string @@ -589,6 +593,22 @@ function isLiveBindingState(value: unknown): value is LiveBindingState { } function liveBindingStateFromTask(task: DouyuTaskRow): LiveBindingState { + const queueState = + task.issue_code === 'mapping_missing' + ? 'mapping_missing' + : !task.live_session_id + ? 'allocation_queued' + : task.status === 'role_ready' + ? 'role_ready' + : ['bound', 'waiting_operator', 'processing', 'completed'].includes(task.status) + ? 'confirmed' + : task.status === 'failed' + ? 'failed' + : task.qr_url + ? 'waiting_scan' + : task.live_execution_status === 'waiting_bind' + ? 'qr_queued' + : 'preparing' return { sessionId: Number(task.live_session_id), platformOrderId: task.platform_order_id, @@ -612,6 +632,8 @@ function liveBindingStateFromTask(task: DouyuTaskRow): LiveBindingState { platName: task.bound_plat_name || '', bindReadyForConfirm: task.status === 'role_ready', bindConfirmed: ['bound', 'waiting_operator', 'processing', 'completed'].includes(task.status), + queueState, + retryAfterMs: queueState === 'allocation_queued' ? 2000 : 0, completedAt: task.completed_at, stateVersion: Number(task.live_state_version || 0), updatedAt: task.updated_at, @@ -815,8 +837,10 @@ export async function saveDouyuCustomerProfile( export async function startDouyuCustomerBinding(orderNo: string, forceRefresh = false) { let task = await loadTaskByOrderNo(orderNo) - const session = await ensureLiveSession(task) - task = session.task + if (!task.live_session_id) { + const session = await ensureLiveSession(task) + task = session.task + } if (!task.live_session_id) { throw createHttpError('直播账号履约会话尚未准备完成', { statusCode: 409, diff --git a/apps/frontend/src/pages/douyu-fulfillment/DouyuFulfillmentPage.tsx b/apps/frontend/src/pages/douyu-fulfillment/DouyuFulfillmentPage.tsx index 9e0f8465..6c5cda87 100644 --- a/apps/frontend/src/pages/douyu-fulfillment/DouyuFulfillmentPage.tsx +++ b/apps/frontend/src/pages/douyu-fulfillment/DouyuFulfillmentPage.tsx @@ -13,6 +13,7 @@ import { useParams } from 'react-router' import { confirmDouyuBinding, fetchDouyuFulfillment, + refreshDouyuBinding, saveDouyuProfile, startDouyuBinding, } from '@/services/douyu-fulfillment' @@ -79,7 +80,6 @@ export default function DouyuFulfillmentPage() { const [qrImage, setQrImage] = useState('') const [bindingQrExpanded, setBindingQrExpanded] = useState(false) const [nowMs, setNowMs] = useState(() => Date.now()) - const autoStartRef = useRef('') const customerRoleRef = useRef('') const roleNameIssue = useMemo(() => getDouyuRoleNameIssue(roleName), [roleName]) @@ -178,33 +178,6 @@ export default function DouyuFulfillmentPage() { return () => window.clearInterval(timer) }, [live?.qrExpiresAt]) - useEffect(() => { - if (!task || !live || needsProfile || live.qrUrl || live.bindConfirmed) return - if (!live.accountReady) return - if ( - task.status !== 'preparing' && - task.status !== 'allocated' && - task.status !== 'waiting_profile' - ) { - return - } - if (autoStartRef.current === orderNo) return - autoStartRef.current = orderNo - let cancelled = false - setBindingLoading(true) - void startDouyuBinding(orderNo) - .then((response) => { - if (!cancelled) applyData(response.data) - }) - .catch(() => undefined) - .finally(() => { - if (!cancelled) setBindingLoading(false) - }) - return () => { - cancelled = true - } - }, [applyData, live, needsProfile, orderNo, task]) - const expiresInSeconds = useMemo(() => { const raw = live?.qrExpiresAt || '' const expiresAt = raw ? Date.parse(raw) : 0 @@ -280,12 +253,18 @@ export default function DouyuFulfillmentPage() { } async function startBinding(forceRefresh = false) { - if (forceRefresh && !qrExpired) { - message.info('二维码有效期内无需刷新') - return - } setBindingLoading(true) try { + if (forceRefresh) { + const refreshed = await refreshDouyuBinding(orderNo) + applyData(refreshed.data) + const refreshedLive = refreshed.data.live + const expiresAt = refreshedLive.qrExpiresAt ? Date.parse(refreshedLive.qrExpiresAt) : 0 + if (refreshedLive.qrUrl && expiresAt > Date.now()) { + message.info('二维码仍在有效期内,已复用当前二维码') + return + } + } const response = await startDouyuBinding(orderNo, forceRefresh) applyData(response.data) message.success(forceRefresh ? '二维码已刷新' : '绑定流程已继续') @@ -296,6 +275,19 @@ export default function DouyuFulfillmentPage() { } } + async function refreshStatus() { + setBindingLoading(true) + try { + const response = await refreshDouyuBinding(orderNo) + applyData(response.data) + message.success('绑定状态已刷新') + } catch (error) { + message.error(error instanceof Error ? error.message : '刷新绑定状态失败') + } finally { + setBindingLoading(false) + } + } + async function confirmBinding() { setBindingLoading(true) try { @@ -501,9 +493,9 @@ export default function DouyuFulfillmentPage() { size="large" className="customer-douyu-preparing-button" loading={bindingLoading} - onClick={() => void startBinding(false)} + onClick={() => void refreshStatus()} > - 继续准备 + 刷新状态 ) : null} diff --git a/apps/frontend/src/services/douyu-fulfillment.ts b/apps/frontend/src/services/douyu-fulfillment.ts index 1781f729..7ca4e135 100644 --- a/apps/frontend/src/services/douyu-fulfillment.ts +++ b/apps/frontend/src/services/douyu-fulfillment.ts @@ -38,6 +38,13 @@ export function pollDouyuBinding(orderNo: string) { ) } +export function refreshDouyuBinding(orderNo: string) { + return apiPost( + `/api/v1/douyu-fulfillment/${encodeURIComponent(orderNo)}/binding/refresh`, + {}, + ) +} + export function confirmDouyuBinding(orderNo: string) { return apiPost( `/api/v1/douyu-fulfillment/${encodeURIComponent(orderNo)}/binding/confirm`, diff --git a/apps/frontend/src/types/douyu-fulfillment.ts b/apps/frontend/src/types/douyu-fulfillment.ts index 68c38552..fd7cffe3 100644 --- a/apps/frontend/src/types/douyu-fulfillment.ts +++ b/apps/frontend/src/types/douyu-fulfillment.ts @@ -58,6 +58,10 @@ export type DouyuLiveBindingState = { platName: string bindReadyForConfirm: boolean bindConfirmed: boolean + queueState?: string + retryAfterMs?: number + queueLane?: string + accepted?: boolean customerProfileReset?: boolean resetReason?: string completedAt: string | null diff --git a/apps/frontend/tests/douyu-fulfillment-refresh.test.ts b/apps/frontend/tests/douyu-fulfillment-refresh.test.ts new file mode 100644 index 00000000..b39a89f9 --- /dev/null +++ b/apps/frontend/tests/douyu-fulfillment-refresh.test.ts @@ -0,0 +1,39 @@ +import assert from 'node:assert/strict' +import { readFileSync } from 'node:fs' +import { dirname, join } from 'node:path' +import { fileURLToPath } from 'node:url' +import test from 'node:test' + +const root = dirname(fileURLToPath(import.meta.url)) +const page = readFileSync( + join(root, '../src/pages/douyu-fulfillment/DouyuFulfillmentPage.tsx'), + 'utf8', +) +const frontendService = readFileSync(join(root, '../src/services/douyu-fulfillment.ts'), 'utf8') +const backendRoute = readFileSync( + join(root, '../../backend/src/routes/douyu-fulfillment.ts'), + 'utf8', +) + +test('斗鱼准备阶段只刷新状态,不自动重复开始绑定', () => { + assert.ok(!page.includes('autoStartRef')) + assert.ok(!page.includes('void startDouyuBinding(orderNo)')) + assert.ok(page.includes('async function refreshStatus()')) + assert.ok(page.includes('onClick={() => void refreshStatus()}')) + assert.ok(page.includes('刷新状态')) +}) + +test('刷新二维码前先同步权威状态,有效二维码直接复用', () => { + const start = page.indexOf('async function startBinding(forceRefresh = false)') + const body = page.slice(start, start + 1200) + assert.ok( + body.indexOf('refreshDouyuBinding(orderNo)') < body.indexOf('startDouyuBinding(orderNo'), + ) + assert.ok(body.includes('二维码仍在有效期内,已复用当前二维码')) +}) + +test('客户刷新状态走独立接口,不复用绑定启动接口', () => { + assert.ok(frontendService.includes('/binding/refresh')) + assert.ok(backendRoute.includes("'/:orderNo/binding/refresh'")) + assert.ok(backendRoute.includes('refreshDouyuCustomerBinding')) +}) diff --git a/docs/斗鱼客户领取与角色绑定.md b/docs/斗鱼客户领取与角色绑定.md index 18b50507..905bcfd8 100644 --- a/docs/斗鱼客户领取与角色绑定.md +++ b/docs/斗鱼客户领取与角色绑定.md @@ -1,6 +1,6 @@ # 斗鱼客户领取与角色绑定 -更新时间:2026-11-17 +更新时间:2026-11-20 ## 入口 @@ -27,7 +27,8 @@ https://order.khhao.com/coll/d/COLLD-E2E-001 1. 打开 `/coll/d/<订单号>`。 2. 填写游戏角色名、微信/QQ、苹果/安卓。 3. `order_site` 通过服务端接口通知 live-hub 准备订单和内部账号。 -4. live-hub 返回安全绑定状态和二维码。 +4. 分配完成后 live-hub 自动启动二维码任务;客户页通过 SSE 重读权威快照, + 不在“准备中”重复调用开始绑定。 5. 客户微信扫码选择和平精英角色。 6. 平台角色与客户资料一致后,客户确认绑定。 7. 绑定完成后等待运营在 live-hub 人工兑换。 @@ -52,6 +53,19 @@ cancelled 最终绑定只认 `bindAct=1`。`bindRole=1, bindAct=0` 表示已识别角色但尚未最终确认。 +绑定启动是幂等异步接口:新建排队返回 `202`,已有有效二维码或已完成返回 `200`; +`mapping_missing`、尚未分配账号和租约失效都是正常业务状态,不通过重复 409 +驱动客户端重试。 + +客户页上的两个刷新动作含义固定: + +- “刷新状态”只读取/同步绑定快照,不启动绑定; +- “刷新二维码”先读取最新状态,未过期直接复用,只有过期或失败才请求新二维码。 + +二维码生成完成后,live-hub 释放执行 Worker,扫码等待由数据库定时调度; +角色识别和绑定确认写入事务 Outbox,经签名 Webhook 到 order_site 后通过 SSE +通知客户页重读。15 分钟对账只作为漏事件兜底,不是正常状态更新路径。 + ## 环境变量 `order_site`: