优化(直播履约): 改为订单快照事件驱动

This commit is contained in:
yml
2026-11-18 16:57:57 +08:00
parent 623a4ffa05
commit 86c8417d4b
21 changed files with 934 additions and 77 deletions
@@ -0,0 +1,253 @@
-- 172_platform_fulfillment_snapshot_contract.sql
--
-- 直播账号履约事件升级为订单项快照契约:
-- 1. order_site 事务 Outbox 直接携带 live-hub 建单所需的事实,不再要求对方回查整表;
-- 2. 配置停用、订单关闭和履约归档也通过同一事件收敛;
-- 3. 入站状态增加版本号,防止 Webhook 重试导致旧状态覆盖新状态。
ALTER TABLE douyu_fulfillment_tasks
ADD COLUMN IF NOT EXISTS live_state_version BIGINT NOT NULL DEFAULT 0;
COMMENT ON COLUMN douyu_fulfillment_tasks.live_state_version IS
'live-hub 单调状态版本;order_site 只接受不小于当前版本的安全投影';
CREATE OR REPLACE FUNCTION enqueue_live_hub_platform_fulfillment_event(
p_order_id BIGINT,
p_order_item_id BIGINT,
p_fulfillment_id BIGINT,
p_reason TEXT
) RETURNS VOID
LANGUAGE plpgsql
AS $$
DECLARE
v_event_id UUID := gen_random_uuid();
v_snapshot JSONB;
v_dedupe_key TEXT;
BEGIN
SELECT jsonb_build_object(
'orderId', o.id,
'orderItemId', oi.id,
'fulfillmentId', f.id,
'sourceOrderId', o.id::text,
'sourceOrderItemId', oi.id::text,
'sourceFulfillmentId', f.id::text,
'platformOrderId', o.platform_order_id,
'provider', o.provider,
'platform', o.platform,
'shopId', o.shop_id,
'shopName', o.shop_name,
'orderStatus', o.order_status,
'payStatus', o.pay_status,
'totalAmountFen', o.total_amount,
'orderCreatedAt', to_char(
o.created_at AT TIME ZONE 'UTC',
'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
),
'paidAt', CASE
WHEN o.paid_at IS NULL THEN NULL
ELSE to_char(o.paid_at AT TIME ZONE 'UTC', 'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"')
END,
'skuCode', oi.sku_code,
'skuName', oi.sku_name,
'internalSkuKey', cfg.sku_key,
'quantity', oi.quantity,
'revenueAmountFen', oi.revenue_amount_fen,
'itemUpdatedAt', to_char(
oi.updated_at AT TIME ZONE 'UTC',
'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
),
'fulfillmentStatus', f.status,
'fulfillmentChannel', f.channel,
'fulfillmentIssueCode', COALESCE(f.issue_code, ''),
'fulfillmentUpdatedAt', to_char(
f.updated_at AT TIME ZONE 'UTC',
'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
),
'configEnabled', cfg.enabled,
'douyuFulfillmentEnabled', cfg.douyu_fulfillment_enabled
)
INTO v_snapshot
FROM orders o
JOIN order_items oi ON oi.order_id = o.id
JOIN fulfillments f ON f.order_item_id = oi.id
JOIN manual_fulfillment_configs cfg ON cfg.id = f.fulfillment_config_id
WHERE o.id = p_order_id
AND oi.id = p_order_item_id
AND f.id = p_fulfillment_id
LIMIT 1;
IF v_snapshot IS NULL THEN
RETURN;
END IF;
v_dedupe_key := CONCAT(
'platform-fulfillment-order:',
p_order_item_id,
':',
md5(v_snapshot::text)
);
INSERT INTO integration_outbox (
event_id, destination, event_type, dedupe_key, payload_json, status, created_at
) VALUES (
v_event_id,
'live_hub',
'platform_fulfillment.order_snapshot',
v_dedupe_key,
jsonb_build_object(
'eventId', v_event_id::text,
'eventType', 'platform_fulfillment.order_snapshot',
'contractVersion', 2,
'occurredAt', to_char(
clock_timestamp() AT TIME ZONE 'UTC',
'YYYY-MM-DD"T"HH24:MI:SS.MS"Z"'
),
'data', v_snapshot || jsonb_build_object(
'reason', COALESCE(p_reason, '')
)
),
'pending',
NOW()
)
ON CONFLICT (dedupe_key) DO NOTHING;
END;
$$;
CREATE OR REPLACE FUNCTION enqueue_platform_fulfillment_from_order()
RETURNS TRIGGER
LANGUAGE plpgsql
AS $$
DECLARE
v_row RECORD;
BEGIN
FOR v_row IN
SELECT oi.id AS order_item_id, f.id AS fulfillment_id
FROM order_items oi
JOIN fulfillments f ON f.order_item_id = oi.id
WHERE oi.order_id = NEW.id
AND f.channel = 'manual'
AND f.status IN ('assigned', 'processing', 'completed', 'archived')
LOOP
PERFORM enqueue_live_hub_platform_fulfillment_event(
NEW.id,
v_row.order_item_id,
v_row.fulfillment_id,
CONCAT('order:', NEW.pay_status, ':', NEW.order_status)
);
END LOOP;
RETURN NEW;
END;
$$;
CREATE OR REPLACE FUNCTION enqueue_platform_fulfillment_from_fulfillment()
RETURNS TRIGGER
LANGUAGE plpgsql
AS $$
DECLARE
v_order_id BIGINT;
BEGIN
SELECT oi.order_id
INTO v_order_id
FROM order_items oi
WHERE oi.id = NEW.order_item_id;
IF v_order_id IS NOT NULL
AND NEW.channel = 'manual'
AND NEW.status IN ('assigned', 'processing', 'completed', 'archived') THEN
PERFORM enqueue_live_hub_platform_fulfillment_event(
v_order_id,
NEW.order_item_id,
NEW.id,
CONCAT('fulfillment:', NEW.status, ':', COALESCE(NEW.issue_code, ''))
);
END IF;
RETURN NEW;
END;
$$;
CREATE OR REPLACE FUNCTION enqueue_platform_fulfillment_from_config()
RETURNS TRIGGER
LANGUAGE plpgsql
AS $$
DECLARE
v_row RECORD;
BEGIN
FOR v_row IN
SELECT o.id AS order_id, oi.id AS order_item_id, f.id AS fulfillment_id
FROM order_items oi
JOIN orders o ON o.id = oi.order_id
JOIN fulfillments f ON f.order_item_id = oi.id
WHERE f.fulfillment_config_id = NEW.id
AND f.channel = 'manual'
AND f.status IN ('assigned', 'processing', 'completed', 'archived')
LOOP
PERFORM enqueue_live_hub_platform_fulfillment_event(
v_row.order_id,
v_row.order_item_id,
v_row.fulfillment_id,
CONCAT(
'config:',
CASE WHEN NEW.enabled THEN 'enabled' ELSE 'disabled' END,
':',
CASE
WHEN NEW.douyu_fulfillment_enabled THEN 'douyu_enabled'
ELSE 'douyu_disabled'
END
)
);
END LOOP;
RETURN NEW;
END;
$$;
DROP TRIGGER IF EXISTS trg_platform_fulfillment_order_sync ON orders;
CREATE TRIGGER trg_platform_fulfillment_order_sync
AFTER INSERT OR UPDATE OF pay_status, order_status ON orders
FOR EACH ROW
EXECUTE FUNCTION enqueue_platform_fulfillment_from_order();
DROP TRIGGER IF EXISTS trg_platform_fulfillment_fulfillment_sync ON fulfillments;
CREATE TRIGGER trg_platform_fulfillment_fulfillment_sync
AFTER INSERT OR UPDATE OF channel, status, fulfillment_config_id, issue_code ON fulfillments
FOR EACH ROW
EXECUTE FUNCTION enqueue_platform_fulfillment_from_fulfillment();
DROP TRIGGER IF EXISTS trg_platform_fulfillment_config_sync
ON manual_fulfillment_configs;
CREATE TRIGGER trg_platform_fulfillment_config_sync
AFTER UPDATE OF enabled, douyu_fulfillment_enabled ON manual_fulfillment_configs
FOR EACH ROW
WHEN (
OLD.enabled IS DISTINCT FROM NEW.enabled
OR OLD.douyu_fulfillment_enabled IS DISTINCT FROM NEW.douyu_fulfillment_enabled
)
EXECUTE FUNCTION enqueue_platform_fulfillment_from_config();
-- 将当前有效任务补成新快照契约。旧版 Outbox 事件仍由 live-hub 的定向兼容路径处理。
DO $$
DECLARE
candidate RECORD;
BEGIN
FOR candidate IN
SELECT o.id AS order_id, oi.id AS order_item_id, f.id AS fulfillment_id
FROM orders o
JOIN order_items oi ON oi.order_id = o.id
JOIN fulfillments f ON f.order_item_id = oi.id
JOIN manual_fulfillment_configs cfg ON cfg.id = f.fulfillment_config_id
WHERE cfg.enabled = TRUE
AND cfg.douyu_fulfillment_enabled = TRUE
AND f.channel = 'manual'
AND f.status IN ('assigned', 'processing', 'completed')
AND o.pay_status = 'paid'
AND o.order_status NOT IN ('refunded', 'cancelled', 'closed')
AND oi.quantity = 1
LOOP
PERFORM enqueue_live_hub_platform_fulfillment_event(
candidate.order_id,
candidate.order_item_id,
candidate.fulfillment_id,
'migration_snapshot_v2'
);
END LOOP;
END;
$$;
@@ -7,10 +7,19 @@ import {
saveDouyuCustomerProfile,
startDouyuCustomerBinding,
} from '../services/douyu-fulfillment/douyu-fulfillment-service.js'
import { openCustomerOrderRealtimeStream } from '../services/realtime/realtime-event-service.js'
import { createRouteHandler } from '../utils/http.js'
const router = Router()
router.get('/:orderNo/realtime', (req, res) => {
openCustomerOrderRealtimeStream(
res,
String(req.params.orderNo || ''),
Number(req.get('Last-Event-ID') || req.query.lastEventId || 0) || 0,
)
})
router.get(
'/:orderNo',
createRouteHandler((req) => getCustomerDouyuFulfillment(String(req.params.orderNo || '')), {
@@ -1,7 +1,10 @@
import type { PoolClient } from 'pg'
import { query, withTransaction } from '../../db/client.js'
import { publishRealtimeEvent } from '../realtime/realtime-event-service.js'
import {
publishCustomerOrderRealtimeChange,
publishRealtimeEvent,
} from '../realtime/realtime-event-service.js'
import { nowIso } from '../../utils/time.js'
import { createHttpError } from '../../utils/http.js'
import { logWarn } from '../../utils/logger.js'
@@ -36,6 +39,7 @@ type DouyuTaskRow = {
bound_at: string | null
completed_at: string | null
last_synced_at: string | null
live_state_version: number | string
qr_url: string
qr_generated_at: string | null
qr_expires_at: string | null
@@ -74,6 +78,7 @@ type LiveBindingState = {
bindConfirmed: boolean
customerProfileReset?: boolean
resetReason?: string
stateVersion?: number | string
completedAt: string | null
updatedAt: string
}
@@ -272,6 +277,7 @@ export async function ensureDouyuFulfillmentTasks(orderNo = '') {
if (candidates.rows.length === 0) return { created: 0, updated: 0 }
let created = 0
const createdOrderNos = new Set<string>()
await withTransaction(async (client) => {
for (const row of candidates.rows) {
const inserted = await client.query<{ id: number; inserted: boolean }>(
@@ -298,12 +304,16 @@ export async function ensureDouyuFulfillmentTasks(orderNo = '') {
if (!taskId) continue
if (inserted.rows[0]?.inserted) {
created += 1
createdOrderNos.add(row.platform_order_id)
await appendEvent(client, taskId, 'task_created', 'system', {
platformOrderId: row.platform_order_id,
})
}
}
})
for (const platformOrderId of createdOrderNos) {
publishCustomerOrderRealtimeChange(platformOrderId, 'douyu_fulfillment_task_created')
}
return { created, updated: candidates.rows.length - created }
}
@@ -424,6 +434,12 @@ export function statusForLive(live: LiveBindingState): string {
return 'preparing'
}
export function isStaleLiveStateVersion(current: unknown, incoming: unknown) {
const currentVersion = Math.max(0, Math.trunc(Number(current || 0)))
const incomingVersion = Math.max(0, Math.trunc(Number(incoming || 0)))
return incomingVersion > 0 && incomingVersion < currentVersion
}
async function updateTaskFromLiveState(
client: Pick<PoolClient, 'query'>,
task: DouyuTaskRow,
@@ -432,6 +448,27 @@ async function updateTaskFromLiveState(
) {
const resetCustomerProfile = live.customerProfileReset === true
const nextStatus = statusForLive(live)
const incomingVersion = Math.max(0, Math.trunc(Number(live.stateVersion || 0)))
const currentVersion = Math.max(0, Math.trunc(Number(task.live_state_version || 0)))
if (isStaleLiveStateVersion(currentVersion, incomingVersion)) {
return false
}
const changed =
incomingVersion > currentVersion ||
Number(task.live_session_id || 0) !== Number(live.sessionId || 0) ||
task.status !== nextStatus ||
task.binding_phase !== live.bindPhase ||
task.live_execution_status !== live.executionStatus ||
task.live_binding_status !== live.bindingStatus ||
task.issue_code !== live.issueCode ||
task.last_error !== live.message ||
task.bound_role_name !== live.roleName ||
task.bound_area_name !== live.areaName ||
task.bound_plat_name !== live.platName ||
task.qr_url !== live.qrUrl ||
normalizeLiveTimestamp(task.qr_generated_at) !== normalizeLiveTimestamp(live.qrGeneratedAt) ||
normalizeLiveTimestamp(task.qr_expires_at) !== normalizeLiveTimestamp(live.qrExpiresAt) ||
resetCustomerProfile
await client.query(
`
UPDATE douyu_fulfillment_tasks
@@ -466,6 +503,7 @@ async function updateTaskFromLiveState(
qr_url = $15,
qr_generated_at = NULLIF($16, '')::timestamptz,
qr_expires_at = NULLIF($17, '')::timestamptz,
live_state_version = GREATEST(live_state_version, $20),
last_synced_at = NOW(),
updated_at = $18
WHERE id = $1
@@ -490,6 +528,7 @@ async function updateTaskFromLiveState(
live.qrExpiresAt,
now,
resetCustomerProfile,
incomingVersion,
],
)
if (nextStatus !== task.status) {
@@ -504,24 +543,35 @@ async function updateTaskFromLiveState(
reason: String(live.resetReason || ''),
})
}
return changed
}
async function applyLiveState(task: DouyuTaskRow, live: LiveBindingState) {
let changed = false
await withTransaction(async (client) => {
await updateTaskFromLiveState(client, task, live, nowIso())
changed = await updateTaskFromLiveState(client, task, live, nowIso())
})
const updated = await loadTask(task.id)
if (changed) {
publishCustomerOrderRealtimeChange(updated.platform_order_id, 'douyu_binding_state_changed')
}
return { task: updated, live, comparison: compareCustomerRole(updated, live) }
}
async function applyLiveStates(entries: Array<{ task: DouyuTaskRow; live: LiveBindingState }>) {
if (entries.length === 0) return
const now = nowIso()
const changedOrderNos = new Set<string>()
await withTransaction(async (client) => {
for (const entry of entries) {
await updateTaskFromLiveState(client, entry.task, entry.live, now)
if (await updateTaskFromLiveState(client, entry.task, entry.live, now)) {
changedOrderNos.add(entry.task.platform_order_id)
}
}
})
for (const platformOrderId of changedOrderNos) {
publishCustomerOrderRealtimeChange(platformOrderId, 'douyu_binding_state_changed')
}
}
function isLiveBindingState(value: unknown): value is LiveBindingState {
@@ -563,10 +613,21 @@ function liveBindingStateFromTask(task: DouyuTaskRow): LiveBindingState {
bindReadyForConfirm: task.status === 'role_ready',
bindConfirmed: ['bound', 'waiting_operator', 'processing', 'completed'].includes(task.status),
completedAt: task.completed_at,
stateVersion: Number(task.live_state_version || 0),
updatedAt: task.updated_at,
}
}
function localCustomerFulfillment(task: DouyuTaskRow) {
const live = liveBindingStateFromTask(task)
return {
task,
live,
comparison: compareCustomerRole(task, live),
linkPath: `/coll/d/${encodeURIComponent(task.platform_order_id)}`,
}
}
export async function applyLiveBindingStateSnapshot(
input: unknown,
options: { eventId?: string; eventType?: string } = {},
@@ -612,7 +673,11 @@ export async function applyLiveBindingStateSnapshot(
[eventId, String(options.eventType || '')],
)
if (claimed.rowCount === 0) {
return { received: rawItems.length, updated: 0 }
return {
received: rawItems.length,
updated: 0,
changedOrderNos: new Set<string>(),
}
}
}
@@ -636,13 +701,21 @@ export async function applyLiveBindingStateSnapshot(
taskByOrderItemId.get(String(live.sourceOrderItemId || ''))
return task ? [{ task, live }] : []
})
let changedCount = 0
const changedOrderNos = new Set<string>()
for (const entry of entries) {
await updateTaskFromLiveState(client, entry.task, entry.live, now)
if (await updateTaskFromLiveState(client, entry.task, entry.live, now)) {
changedCount += 1
changedOrderNos.add(entry.task.platform_order_id)
}
}
return { received: rawItems.length, updated: entries.length }
return { received: rawItems.length, updated: changedCount, changedOrderNos }
})
if (result.updated > 0) {
for (const platformOrderId of result.changedOrderNos) {
publishCustomerOrderRealtimeChange(platformOrderId, 'douyu_binding_state_changed')
}
publishRealtimeEvent({
type: 'order.changed',
entityId: 0,
@@ -652,7 +725,14 @@ export async function applyLiveBindingStateSnapshot(
admin: true,
})
}
return result
return { received: result.received, updated: result.updated }
}
function normalizeLiveTimestamp(value: unknown) {
const text = String(value || '').trim()
if (!text) return ''
const parsed = Date.parse(text)
return Number.isFinite(parsed) ? new Date(parsed).toISOString() : text
}
async function ensureLiveSession(task: DouyuTaskRow) {
@@ -682,13 +762,7 @@ export async function getCustomerDouyuFulfillment(orderNo: string) {
await appendEvent(client, task.id, 'customer_link_opened', 'customer')
})
}
const session = await ensureLiveSession(task)
return {
task: session.task,
live: session.live,
comparison: session.comparison,
linkPath: `/coll/d/${encodeURIComponent(task.platform_order_id)}`,
}
return localCustomerFulfillment(task)
}
export async function saveDouyuCustomerProfile(
@@ -766,18 +840,7 @@ export async function refreshDouyuCustomerBinding(orderNo: string) {
}
export async function getDouyuCustomerFulfillmentCached(orderNo: string) {
let task = await loadTaskByOrderNo(orderNo)
if (!task.live_session_id) {
return ensureLiveSession(task)
}
task = await loadTask(task.id)
const live = liveBindingStateFromTask(task)
return {
task,
live,
comparison: compareCustomerRole(task, live),
linkPath: `/coll/d/${encodeURIComponent(task.platform_order_id)}`,
}
return localCustomerFulfillment(await loadTaskByOrderNo(orderNo))
}
export async function confirmDouyuCustomerBinding(orderNo: string) {
@@ -918,7 +981,7 @@ export async function listDouyuFulfillmentTasks(
export async function getDouyuFulfillmentDetail(orderNo: string) {
const task = await loadTaskByOrderNo(orderNo)
const [session, events] = await Promise.all([
ensureLiveSession(task),
Promise.resolve(localCustomerFulfillment(task)),
query<{
id: number
event_type: string
@@ -4,6 +4,7 @@ import test from 'node:test'
import {
applyLiveBindingStateSnapshot,
compareCustomerRole,
isStaleLiveStateVersion,
statusForLive,
} from './douyu-fulfillment-service.js'
@@ -81,6 +82,13 @@ test('已分配账号保持 allocated,不折叠成准备账号', () => {
assert.equal(status, 'allocated')
})
test('直播账号状态版本只允许向前推进', () => {
assert.equal(isStaleLiveStateVersion(8, 7), true)
assert.equal(isStaleLiveStateVersion(8, 8), false)
assert.equal(isStaleLiveStateVersion(8, 9), false)
assert.equal(isStaleLiveStateVersion(8, 0), false)
})
test('直播账号状态推送忽略空数据和无效任务', async () => {
assert.deepEqual(await applyLiveBindingStateSnapshot({ items: [] }), {
received: 0,
@@ -47,6 +47,10 @@ import {
transitionFulfillmentStateBatchWithExecutor,
transitionFulfillmentStateWithExecutor,
} from './fulfillment-state-service.js'
import {
publishAdminOrderRealtimeChange,
publishCustomerOrderRealtimeChangeByOrderIds,
} from '../realtime/realtime-event-service.js'
/**
* 管道 A:渠道判定。
@@ -269,10 +273,17 @@ export async function assignPendingOrderItemChannels(
): Promise<AssignChannelsResult> {
const batchSize = Math.min(5000, Math.max(1, Math.trunc(options.batchSize || 500)))
const maxBatches = Math.min(200, Math.max(1, Math.trunc(options.maxBatches || 20)))
const requestedIds = [
...new Set(
(options.orderItemIds || []).map(Number).filter((id) => Number.isInteger(id) && id > 0),
),
]
let cursor =
options.afterId != null
? Math.max(0, Math.trunc(options.afterId))
: await readWatermarkItemId('channel_assign')
requestedIds.length > 0
? 0
: options.afterId != null
? Math.max(0, Math.trunc(options.afterId))
: await readWatermarkItemId('channel_assign')
let reachedEnd = false
const result: AssignChannelsResult = {
@@ -288,11 +299,6 @@ export async function assignPendingOrderItemChannels(
pendingReasons: {},
}
const affectedDates = new Set<string>()
const requestedIds = [
...new Set(
(options.orderItemIds || []).map(Number).filter((id) => Number.isInteger(id) && id > 0),
),
]
const params: unknown[] = [cursor, batchSize]
let requestedFilter = ''
if (requestedIds.length > 0) {
@@ -444,6 +450,9 @@ export async function assignPendingOrderItemChannels(
0,
2000,
)
const affectedOrderIds = [
...new Set(updated.map((row) => Number(row.order_id)).filter((id) => id > 0)),
]
await ensureSemiAutoTasksForOrderItems(assignedItemIds).catch((error) => {
logWarn('[channel-assign]', '半自动任务主动物化失败,等待后台回填', {
orderItemIds: assignedItemIds,
@@ -458,6 +467,10 @@ export async function assignPendingOrderItemChannels(
})
},
)
for (const orderId of affectedOrderIds) {
publishAdminOrderRealtimeChange(orderId)
}
publishCustomerOrderRealtimeChangeByOrderIds(affectedOrderIds, 'fulfillment_channel_updated')
}
if (unmatchedVoucherItemIds.length > 0) {
@@ -478,6 +491,45 @@ export async function assignPendingOrderItemChannels(
return result
}
/**
* 新单事件驱动的履约推进:只处理当前订单项,避免等待全局游标和每分钟兜底任务。
*/
export async function advanceFulfillmentForOrderItems(orderItemIdsInput: number[]) {
const orderItemIds = [
...new Set(
(orderItemIdsInput || []).map(Number).filter((id) => Number.isInteger(id) && id > 0),
),
]
if (orderItemIds.length === 0) {
return {
assigned: 0,
carrierAttempts: 0,
reassigned: 0,
}
}
const initial = await assignPendingOrderItemChannels({
orderItemIds,
batchSize: Math.min(500, orderItemIds.length),
maxBatches: 1,
})
const carriers = await reconcilePendingCarriers({
orderItemIds,
limit: Math.min(500, orderItemIds.length),
})
const final = await assignPendingOrderItemChannels({
orderItemIds,
batchSize: Math.min(500, orderItemIds.length),
maxBatches: 1,
})
return {
assigned: initial.assigned + final.assigned,
carrierAttempts:
carriers.workOrdersCreated + carriers.affiliateTasksCreated + carriers.fallbacksSelected,
reassigned: final.assigned,
}
}
export async function assignOrderItemsAfterCarrierReady(input: {
orderItemIds: number[]
channel: FulfillmentChannel
@@ -0,0 +1,68 @@
import assert from 'node:assert/strict'
import { readFileSync } from 'node:fs'
import test from 'node:test'
function source(relativePath: string) {
return readFileSync(new URL(relativePath, import.meta.url), 'utf8')
}
test('新订单定向推进不受全局渠道判定游标影响', () => {
const channelAssign = source('./channel-assign-service.ts')
assert.ok(channelAssign.includes('requestedIds.length > 0'))
assert.ok(channelAssign.includes('advanceFulfillmentForOrderItems'))
assert.ok(channelAssign.includes('orderItemIds'))
assert.ok(channelAssign.includes('reconcilePendingCarriers'))
})
test('发单消费者完成当前订单后立即推进履约和自动发布,定时任务只兜底', () => {
const workerSync = source('../worker-platform/sync-worker-orders-service.ts')
assert.ok(workerSync.includes('advanceFulfillmentForOrderItems(orderItems.map'))
assert.ok(workerSync.includes('enqueueOrderServiceAutoPublish'))
assert.ok(workerSync.includes('processDueOrderServiceAutoPublishJobs'))
assert.ok(workerSync.includes('等待定时任务兜底'))
})
test('渠道和载体状态变化主动推送后台列表', () => {
const channelAssign = source('./channel-assign-service.ts')
const financeJobs = source('../scheduler/finance-pipeline-jobs.ts')
assert.ok(channelAssign.includes('publishAdminOrderRealtimeChange'))
assert.ok(channelAssign.includes('publishCustomerOrderRealtimeChangeByOrderIds'))
assert.ok(financeJobs.includes('manual_fulfillment_ready'))
})
test('管道状态和斗鱼客户页由 SSE 驱动,live-hub 同步完成后主动唤醒', () => {
const scheduler = source('../scheduler/scheduler-service.ts')
const outbox = source('../integration/outbox-worker.ts')
const douyuRoute = source('../../routes/douyu-fulfillment.ts')
assert.ok(scheduler.includes("type: 'fulfillment_pipeline.changed'"))
assert.ok(outbox.includes('live_hub_order_synced'))
assert.ok(douyuRoute.includes('openCustomerOrderRealtimeStream'))
})
test('斗鱼客户读取不再阻塞调用 live-hub,状态由 Webhook 收敛', () => {
const douyuService = source('../douyu-fulfillment/douyu-fulfillment-service.ts')
const customerRead = douyuService.slice(
douyuService.indexOf('export async function getCustomerDouyuFulfillment'),
douyuService.indexOf('export async function saveDouyuCustomerProfile'),
)
const cachedRead = douyuService.slice(
douyuService.indexOf('export async function getDouyuCustomerFulfillmentCached'),
douyuService.indexOf('export async function confirmDouyuCustomerBinding'),
)
assert.ok(customerRead.includes('return localCustomerFulfillment(task)'))
assert.ok(cachedRead.includes('return localCustomerFulfillment'))
assert.ok(!customerRead.includes('ensureLiveSession'))
assert.ok(!cachedRead.includes('ensureLiveSession'))
})
test('新单快速推进只处理 actionable 履约桶', () => {
const channelAssign = source('./channel-assign-service.ts')
const advance = channelAssign.slice(
channelAssign.indexOf('export async function advanceFulfillmentForOrderItems'),
channelAssign.indexOf('export async function assignOrderItemsAfterCarrierReady'),
)
assert.ok(advance.includes('reconcilePendingCarriers'))
assert.ok(!advance.includes('includeNonActionable'))
})
@@ -50,6 +50,7 @@ test(
const { updateOrderItemSourceSnapshot } = await import('../../repositories/order-item-repo.js')
const { listTasks } = await import('../../repositories/task-repo.js')
const { listVoucherConsumeJobs } = await import('./voucher-consume-queue-service.js')
const { readWatermarkItemId, touchWatermark } = await import('../watermark-store.js')
const suffix = `${Date.now()}_${Math.floor(Math.random() * 1_000_000)}`
const shopId = `it-routing-${suffix}`
const manualSku = `集成测试人工-${suffix}`
@@ -65,6 +66,7 @@ test(
const reactivatedVoucherSku = `集成测试归档卡券-${suffix}`
const retryPendingAffiliateSku = `集成测试失败待重试-${suffix}`
const cutoffTestSku = `集成测试自动化边界-${suffix}`
const cursorAdvanceSku = `集成测试定向游标-${suffix}`
const retryWorkOrderRuleKey = `it-retry-${suffix}`
const orderIds: number[] = []
const orderItemIds: number[] = []
@@ -228,6 +230,24 @@ test(
assert.equal(cutoffStates.rows[0]?.fulfillment_status, 'pending')
assert.equal(cutoffStates.rows[1]?.fulfillment_status, 'assigned')
const cursorAdvanceItemId = await createPendingOrderItem(cursorAdvanceSku)
await setRoute({ sku: cursorAdvanceSku, channel: 'third_party_voucher' })
const originalChannelCursor = await readWatermarkItemId('channel_assign')
await touchWatermark('channel_assign', {
lastItemId: cursorAdvanceItemId + 1_000_000,
})
try {
const targetedAdvance = await assignPendingOrderItemChannels({
orderItemIds: [cursorAdvanceItemId],
batchSize: 10,
maxBatches: 1,
})
assert.equal(targetedAdvance.scanned, 1)
assert.equal(targetedAdvance.assigned, 1)
} finally {
await touchWatermark('channel_assign', { lastItemId: originalChannelCursor })
}
await setRoute({
sku: ` 集成测试 规范-${suffix} `,
channel: 'manual',
@@ -13,3 +13,20 @@ test('Outbox migration keeps header event id and payload eventId identical', ()
assert.match(sql, /CREATE TABLE IF NOT EXISTS integration_outbox/)
assert.match(sql, /CREATE TABLE IF NOT EXISTS integration_inbox/)
})
test('订单项快照事件携带定向履约事实和稳定去重键', () => {
const sql = readFileSync(
new URL('../../db/migrations/172_platform_fulfillment_snapshot_contract.sql', import.meta.url),
'utf8',
)
assert.match(sql, /'sourceOrderItemId', oi\.id::text/)
assert.match(sql, /'internalSkuKey', cfg\.sku_key/)
assert.match(sql, /'orderCreatedAt'/)
assert.match(sql, /'paidAt'/)
assert.match(sql, /'fulfillmentStatus', f\.status/)
assert.match(sql, /md5\(v_snapshot::text/)
assert.match(sql, /platform_fulfillment\.order_snapshot/)
assert.match(sql, /live_state_version/)
assert.doesNotMatch(sql, /LIMIT 500/)
})
@@ -1,6 +1,7 @@
import { query, withTransaction } from '../../db/client.js'
import { logError, logInfo, logWarn } from '../../utils/logger.js'
import { buildWebhookSignature } from './webhook-signature.js'
import { publishCustomerOrderRealtimeChange } from '../realtime/realtime-event-service.js'
const DEFAULT_INTERVAL_MS = 1000
const DEFAULT_BATCH_SIZE = 20
@@ -161,12 +162,33 @@ async function publishDueEvents() {
try {
await deliverEvent(row)
await markSent(row.event_id)
publishCustomerOrderRealtimeChange(
platformOrderIdFromOutboxPayload(row.payload_json),
'live_hub_order_synced',
)
} catch (error) {
await markFailed(row, error)
}
}
}
function platformOrderIdFromOutboxPayload(payload: unknown) {
const value =
typeof payload === 'string'
? (() => {
try {
return JSON.parse(payload)
} catch {
return null
}
})()
: payload
if (!value || typeof value !== 'object' || Array.isArray(value)) return ''
const data = (value as { data?: unknown }).data
if (!data || typeof data !== 'object' || Array.isArray(data)) return ''
return String((data as { platformOrderId?: unknown }).platformOrderId || '').trim()
}
async function runLoop() {
if (stopped || running) return
running = true
@@ -0,0 +1,111 @@
/**
* 直播账号履约订单快照 Outbox 集成测试(需要已完成迁移的真实 PostgreSQL)。
*
* 运行:
* FULFILLMENT_OUTBOX_TEST_DATABASE_URL="$DATABASE_URL" \
* npx tsx --test src/services/integration/platform-fulfillment-outbox.integration.test.ts
*/
import assert from 'node:assert/strict'
import test from 'node:test'
const TEST_DATABASE_URL = String(process.env.FULFILLMENT_OUTBOX_TEST_DATABASE_URL || '').trim()
test(
'履约事务 Outbox 发送定向订单项快照且同一状态只产生一个事件',
{ skip: !TEST_DATABASE_URL ? '未设置 FULFILLMENT_OUTBOX_TEST_DATABASE_URL' : false },
async () => {
process.env.DATABASE_URL = TEST_DATABASE_URL
const { closeDb, query } = await import('../../db/client.js')
const suffix = `${Date.now()}_${Math.floor(Math.random() * 1_000_000)}`
const platformOrderId = `IT-PF-OUTBOX-${suffix}`
const internalSku = `集成履约快照-${suffix}`
let configId = 0
let orderId = 0
try {
const config = await query<{ id: number }>(
`INSERT INTO manual_fulfillment_configs (
sku_key, platform_key, credit_quantity, cost_mode, enabled,
douyu_fulfillment_enabled, created_at, updated_at
) VALUES ($1, 'nanhang', 1, 'fixed', TRUE, TRUE, NOW(), NOW())
RETURNING id`,
[internalSku],
)
configId = Number(config.rows[0]!.id)
const order = await query<{ id: number }>(
`INSERT INTO orders (
provider, platform, shop_id, shop_name, platform_order_id,
order_status, pay_status, total_amount, paid_at, created_at, updated_at
) VALUES (
'integration-test', 'integration-test', $1, '集成测试店', $2,
'paid', 'paid', 9900, NOW(), NOW(), NOW()
) RETURNING id`,
[`shop-${suffix}`, platformOrderId],
)
orderId = Number(order.rows[0]!.id)
const item = await query<{ id: number }>(
`INSERT INTO order_items (
order_id, sku_code, sku_name, quantity, spec_json,
revenue_amount_fen, revenue_basis, created_at, updated_at
) VALUES (
$1, $2, $2, 1, $3::jsonb, 9900, 'order_total', NOW(), NOW()
) RETURNING id`,
[orderId, `sku-${suffix}`, JSON.stringify({ skuNick: internalSku })],
)
const fulfillment = await query(
`UPDATE fulfillments
SET internal_sku = $2,
route_status = 'configured',
channel = 'manual',
carrier_status = 'ready',
status = 'assigned',
source = 'integration_test',
fulfillment_config_id = $3,
updated_at = NOW()
WHERE order_item_id = $1`,
[Number(item.rows[0]!.id), internalSku, configId],
)
assert.equal(fulfillment.rowCount, 1)
const events = await query<{
contract_version: string
source_order_item_id: string
internal_sku_key: string
fulfillment_status: string
}>(
`SELECT
payload_json->>'contractVersion' AS contract_version,
payload_json->'data'->>'sourceOrderItemId' AS source_order_item_id,
payload_json->'data'->>'internalSkuKey' AS internal_sku_key,
payload_json->'data'->>'fulfillmentStatus' AS fulfillment_status
FROM integration_outbox
WHERE payload_json->'data'->>'platformOrderId' = $1`,
[platformOrderId],
)
assert.equal(events.rows.length, 1)
assert.equal(events.rows[0]!.contract_version, '2')
assert.equal(events.rows[0]!.source_order_item_id, String(item.rows[0]!.id))
assert.equal(events.rows[0]!.internal_sku_key, internalSku)
assert.equal(events.rows[0]!.fulfillment_status, 'assigned')
} finally {
await query(
`DELETE FROM integration_outbox
WHERE payload_json->'data'->>'platformOrderId' = $1`,
[platformOrderId],
).catch(() => undefined)
if (orderId > 0) {
await query('DELETE FROM orders WHERE id = $1', [orderId]).catch(() => undefined)
}
if (configId > 0) {
await query('DELETE FROM manual_fulfillment_configs WHERE id = $1', [configId]).catch(
() => undefined,
)
}
await closeDb()
}
},
)
@@ -1,5 +1,6 @@
import type { Response } from 'express'
import { query } from '../../db/client.js'
import { WORK_ORDER_STATUS } from '../../domain/work-order-status.js'
import {
@@ -47,6 +48,8 @@ import { invalidateWorkerMyOrderCaches } from '../worker-platform/worker-my-orde
export type RealtimeEventType =
| 'admin_notification.changed'
| 'customer_order.changed'
| 'fulfillment_pipeline.changed'
| 'order.changed'
| 'work_order.changed'
| 'worker_finance_request.changed'
@@ -78,6 +81,7 @@ type RealtimeSubscriber = {
id: number
response: Response
workerId: number | null
orderNo: string | null
}
type StoredRealtimeEvent = RealtimeEvent & {
@@ -88,6 +92,7 @@ type StoredRealtimeEvent = RealtimeEvent & {
const adminSubscribers = new Map<number, RealtimeSubscriber>()
const workerSubscribers = new Map<number, RealtimeSubscriber>()
const orderSubscribers = new Map<number, RealtimeSubscriber>()
let nextSubscriberId = 1
let heartbeatTimer: NodeJS.Timeout | null = null
let publishQueue: Promise<void> = Promise.resolve()
@@ -120,6 +125,54 @@ export function openWorkerRealtimeStream(response: Response, workerId: number, l
return openRealtimeStream(response, Number(workerId), lastEventId)
}
/** 客户订单级实时信号只决定“需要重读”,不携带订单或平台敏感快照。 */
export function openCustomerOrderRealtimeStream(
response: Response,
orderNo: string,
lastEventId = 0,
) {
return openRealtimeStream(response, null, lastEventId, String(orderNo || '').trim())
}
export function publishCustomerOrderRealtimeChange(orderNoInput: unknown, reason: string) {
const orderNo = String(orderNoInput || '').trim()
if (!orderNo) return
const event: RealtimeEvent = {
eventId: 0,
version: 0,
type: 'customer_order.changed',
entityId: 0,
scopes: [`customer_order:${orderNo}`],
operation: 'refresh',
data: { reason: String(reason || '').trim() },
occurredAt: new Date().toISOString(),
}
broadcast(
Array.from(orderSubscribers.values()).filter((subscriber) => subscriber.orderNo === orderNo),
event,
)
}
export function publishCustomerOrderRealtimeChangeByOrderIds(
orderIdsInput: number[],
reason: string,
) {
const orderIds = [
...new Set((orderIdsInput || []).map(Number).filter((id) => Number.isInteger(id) && id > 0)),
]
if (orderIds.length === 0) return
void query<{ platform_order_id: string }>(
`SELECT platform_order_id FROM orders WHERE id = ANY($1::bigint[])`,
[orderIds],
)
.then((result) => {
for (const row of result.rows) {
publishCustomerOrderRealtimeChange(row.platform_order_id, reason)
}
})
.catch(() => undefined)
}
/** 发布带版本号和数据快照的实时事件;数据库仍是最终权威数据源。 */
export function publishRealtimeEvent(input: RealtimeEventInput) {
const workerIds = [
@@ -563,13 +616,20 @@ async function publishWorkerFinanceSnapshots(input: {
}
}
function openRealtimeStream(response: Response, workerId: number | null, lastEventId: number) {
function openRealtimeStream(
response: Response,
workerId: number | null,
lastEventId: number,
orderNo: string | null = null,
) {
const subscriber: RealtimeSubscriber = {
id: nextSubscriberId++,
response,
workerId,
orderNo,
}
const subscribers = workerId === null ? adminSubscribers : workerSubscribers
const subscribers =
orderNo !== null ? orderSubscribers : workerId === null ? adminSubscribers : workerSubscribers
response.status(200)
response.setHeader('Content-Type', 'text/event-stream; charset=utf-8')
@@ -650,6 +710,12 @@ function normalizeStringArray(value: unknown): string[] {
}
function isEventVisibleToSubscriber(event: StoredRealtimeEvent, subscriber: RealtimeSubscriber) {
if (subscriber.orderNo !== null) {
return (
event.type === 'customer_order.changed' &&
event.scopes.includes(`customer_order:${subscriber.orderNo}`)
)
}
if (subscriber.workerId === null) return event.adminAudience
return event.broadcastWorkers || event.workerIds.includes(Number(subscriber.workerId))
}
@@ -692,7 +758,12 @@ function writeEventFrame(subscriber: RealtimeSubscriber, frame: string) {
}
function removeSubscriber(subscriber: RealtimeSubscriber) {
const subscribers = subscriber.workerId === null ? adminSubscribers : workerSubscribers
const subscribers =
subscriber.orderNo !== null
? orderSubscribers
: subscriber.workerId === null
? adminSubscribers
: workerSubscribers
subscribers.delete(subscriber.id)
stopHeartbeatWhenIdle()
}
@@ -700,7 +771,11 @@ function removeSubscriber(subscriber: RealtimeSubscriber) {
function ensureHeartbeat() {
if (heartbeatTimer) return
heartbeatTimer = setInterval(() => {
for (const subscriber of [...adminSubscribers.values(), ...workerSubscribers.values()]) {
for (const subscriber of [
...adminSubscribers.values(),
...workerSubscribers.values(),
...orderSubscribers.values(),
]) {
if (subscriber.response.writableEnded || subscriber.response.destroyed) {
removeSubscriber(subscriber)
continue
@@ -716,7 +791,14 @@ function ensureHeartbeat() {
}
function stopHeartbeatWhenIdle() {
if (adminSubscribers.size > 0 || workerSubscribers.size > 0 || !heartbeatTimer) return
if (
adminSubscribers.size > 0 ||
workerSubscribers.size > 0 ||
orderSubscribers.size > 0 ||
!heartbeatTimer
) {
return
}
clearInterval(heartbeatTimer)
heartbeatTimer = null
}
@@ -34,6 +34,10 @@ import {
type FinancePipelineName,
} from './finance-pipeline-status.js'
import { ensureSemiAutoTasksForOrderItems } from '../semi-auto/semi-auto-task-service.js'
import {
publishAdminOrderRealtimeChange,
publishCustomerOrderRealtimeChangeByOrderIds,
} from '../realtime/realtime-event-service.js'
/**
* 财务与履约管道作业。
@@ -146,9 +150,15 @@ export async function runCarrierDispatchJob(job: JsonObject = {}) {
const manualParams: unknown[] = [limit, cursor, configKeys]
const manualCutoff = fulfillmentCreatedAfterSql(manualParams, cutoffCreatedAt)
const manual = await query<{ id: number; sku_key: string; config_id: number }>(
const manual = await query<{
id: number
order_id: number
sku_key: string
config_id: number
}>(
`
SELECT oi.id,
oi.order_id,
resolve_internal_sku(oi.manual_sku_key, oi.sku_name, oi.sku_code) AS sku_key,
cfg.id AS config_id
FROM v_order_item_current oi
@@ -182,6 +192,11 @@ export async function runCarrierDispatchJob(job: JsonObject = {}) {
attached = configured.length
if (attached > 0) {
await ensureSemiAutoTasksForOrderItems(manual.rows.map((row) => Number(row.id)))
const orderIds = manual.rows.map((row) => Number(row.order_id))
for (const orderId of new Set(orderIds)) {
publishAdminOrderRealtimeChange(orderId)
}
publishCustomerOrderRealtimeChangeByOrderIds(orderIds, 'manual_fulfillment_ready')
}
}
@@ -16,6 +16,7 @@ import {
runSalesFactsJob,
} from './finance-pipeline-jobs.js'
import { runVoucherConsumeDispatchJob } from '../fulfillment/voucher-consume-queue-service.js'
import { publishRealtimeEvent } from '../realtime/realtime-event-service.js'
const timers = new Map<string, NodeJS.Timeout>()
const jobStates = new Map<string, JsonObject>()
@@ -91,6 +92,7 @@ function rescheduleJob(job: JsonObject) {
if (!latestJob || latestJob.enabled !== true) return
const intervalMs = Math.max(1, Number(latestJob.intervalSeconds || 20)) * 1000
scheduleJob(latestJob, intervalMs)
publishPipelineRealtimeChange(latestJob.id, 'scheduled')
}
function scheduleJob(job: JsonObject, delayMs: number) {
@@ -138,6 +140,7 @@ async function runJob(job: JsonObject, { manual = false }: { manual?: boolean }
lastStatus: 'running',
lastMessage: '执行中',
})
publishPipelineRealtimeChange(jobId, 'started')
try {
const result = await dispatchJob(job)
@@ -157,6 +160,7 @@ async function runJob(job: JsonObject, { manual = false }: { manual?: boolean }
lastFailedCount: Number(summary.failedCount || 0),
lastManual: manual,
})
publishPipelineRealtimeChange(jobId, 'finished')
const status = String(summary.status || 'ok')
const failedCount = Number(summary.failedCount || 0)
// 成功且无失败的周期空跑降到 debug(PDD 约 20s 一轮),手动触发与失败仍保留 info。
@@ -185,6 +189,7 @@ async function runJob(job: JsonObject, { manual = false }: { manual?: boolean }
lastMessage: message,
lastManual: manual,
})
publishPipelineRealtimeChange(jobId, 'failed')
logError('[scheduler]', '定时任务执行失败', {
jobId,
type: job.type,
@@ -198,6 +203,20 @@ async function runJob(job: JsonObject, { manual = false }: { manual?: boolean }
}
}
function publishPipelineRealtimeChange(jobId: unknown, phase: string) {
publishRealtimeEvent({
type: 'fulfillment_pipeline.changed',
entityId: 0,
scopes: ['admin_fulfillment_pipelines'],
operation: 'refresh',
data: {
jobId: String(jobId || '').trim(),
phase: String(phase || '').trim(),
},
admin: true,
})
}
function dispatchJob(job: JsonObject) {
if (job.type === 'work_order_timeout') {
return runWorkOrderTimeoutJob(job)
@@ -44,7 +44,7 @@ import {
resolveWorkOrderSharingEnabled,
} from './mappers.js'
import { registerWorkOrderShopName } from './work-order-shop-options-cache.js'
import { assignPendingOrderItemChannels } from '../fulfillment/channel-assign-service.js'
import { advanceFulfillmentForOrderItems } from '../fulfillment/channel-assign-service.js'
import { attachFulfillmentConfigurations } from '../fulfillment/fulfillment-state-service.js'
import {
loadInternalSkuChannelPlans,
@@ -61,6 +61,10 @@ import {
getPublishedOrderServiceProfileSnapshotByCategory,
isOrderServiceMaterialRequired,
} from './order-service-profile-service.js'
import {
enqueueOrderServiceAutoPublish,
processDueOrderServiceAutoPublishJobs,
} from './order-service-auto-publish-service.js'
export function shouldBootstrapWorkOrderChannel(
plan: InternalSkuChannelPlan | undefined,
@@ -143,6 +147,7 @@ export async function syncWorkerOrdersForSourceOrder(
const skipped: Array<{ orderItemId: number; reason: string }> = []
const decisions: Array<Record<string, unknown>> = []
const internalSkuByItemId = new Map<number, string>()
let autoPublishQueued = false
for (const item of orderItems) {
internalSkuByItemId.set(
Number(item.id),
@@ -526,15 +531,33 @@ export async function syncWorkerOrdersForSourceOrder(
workOrderNo: workOrder.work_order_no,
productName: workOrder.product_name,
})
} else if (materialComplete && serviceProfile?.config.autoPublish.enabled) {
const job = await enqueueOrderServiceAutoPublish({
workOrderId: Number(workOrder.id),
maxAttempts: serviceProfile.config.autoPublish.retryMax + 1,
})
autoPublishQueued = Boolean(job)
if (job) {
await createWorkOrderEvent({
workOrderId: Number(workOrder.id),
actorType: 'system',
actorId: 'source_order_auto_publish',
eventType: 'auto_publish_queued',
fromStatus: workOrder.status,
toStatus: workOrder.status,
payloadJson: JSON.stringify({ jobId: Number(job) }),
now: nowIso(),
})
}
}
}
// 订单处理完成后立即跑一次渠道判定;失败不阻断下单,由定时任务兜底。
// 订单处理完成后只推进当前订单项;定时任务仅作为漏事件兜底。
if (!options.skipChannelAssign) {
try {
await assignPendingOrderItemChannels({ batchSize: 200, maxBatches: 1 })
await advanceFulfillmentForOrderItems(orderItems.map((item) => Number(item.id)))
} catch (error) {
logWarn('[worker-order-consumer]', '履约方式归集失败,等待定时任务兜底', {
logWarn('[worker-order-consumer]', '当前订单履约推进失败,等待定时任务兜底', {
orderId: order.id,
platformOrderId: order.platform_order_id,
orderItemCount: orderItems.length,
@@ -542,6 +565,15 @@ export async function syncWorkerOrdersForSourceOrder(
})
}
}
if (autoPublishQueued) {
await processDueOrderServiceAutoPublishJobs(Math.max(1, created.length)).catch((error) => {
logWarn('[worker-order-consumer]', '订单服务即时自动发布失败,等待定时任务兜底', {
orderId: order.id,
platformOrderId: order.platform_order_id,
error: error instanceof Error ? error.message : String(error),
})
})
}
const summary = {
source: options.source || 'source_order',
@@ -458,6 +458,8 @@ export function formatWorkOrderEvent(event: WorkOrderEvent): EventNodeStyle {
}
// —— 其他 ——
case 'auto_publish_queued':
return { title: '订单自动发布已入队', color: 'blue' }
case 'auto_publish_succeeded':
return { title: '订单自动发布成功', color: 'geekblue' }
case 'admin_note_updated':
+12 -6
View File
@@ -5,6 +5,8 @@ export type RealtimeEvent = {
version: number
type:
| 'admin_notification.changed'
| 'customer_order.changed'
| 'fulfillment_pipeline.changed'
| 'order.changed'
| 'work_order.changed'
| 'worker_finance_request.changed'
@@ -18,7 +20,8 @@ export type RealtimeEvent = {
type UseRealtimeEventsOptions = {
url: string
token: string
token?: string
allowAnonymous?: boolean
onEvent: (event: RealtimeEvent) => void
onConnected?: () => void
/**
@@ -38,6 +41,7 @@ const RECONNECT_DELAY_MS = 3_000
export function useRealtimeEvents({
url,
token,
allowAnonymous,
onEvent,
onConnected,
onResync,
@@ -53,7 +57,7 @@ export function useRealtimeEvents({
onAuthExpiredRef.current = onAuthExpired
useEffect(() => {
if (!token) return
if (!token && !allowAnonymous) return
let stopped = false
let abortController: AbortController | null = null
@@ -67,8 +71,8 @@ export function useRealtimeEvents({
const headers: Record<string, string> = {
Accept: 'text/event-stream',
Authorization: `Bearer ${token}`,
}
if (token) headers.Authorization = `Bearer ${token}`
if (lastEventId > 0) headers['Last-Event-ID'] = String(lastEventId)
let authExpired = false
void fetch(url, {
@@ -101,8 +105,8 @@ export function useRealtimeEvents({
if (eventName !== 'realtime') return
const event = normalizeRealtimeEvent(data)
if (event) {
if (event.eventId <= lastEventId) return
lastEventId = Math.max(lastEventId, event.eventId)
if (event.eventId > 0 && event.eventId <= lastEventId) return
if (event.eventId > 0) lastEventId = Math.max(lastEventId, event.eventId)
onEventRef.current(event)
}
})
@@ -131,7 +135,7 @@ export function useRealtimeEvents({
abortController?.abort()
window.clearTimeout(reconnectTimer)
}
}, [token, url])
}, [allowAnonymous, token, url])
}
async function readSseStream(
@@ -189,6 +193,8 @@ function normalizeRealtimeEvent(value: string): RealtimeEvent | null {
if (
![
'admin_notification.changed',
'customer_order.changed',
'fulfillment_pipeline.changed',
'order.changed',
'work_order.changed',
'worker_finance_request.changed',
@@ -559,6 +559,14 @@ function applyAdminRealtimeEvent(
})
}
if (
event.type === 'fulfillment_pipeline.changed' &&
event.scopes.includes('admin_fulfillment_pipelines')
) {
void queryClient.invalidateQueries({ queryKey: ['fulfillment-pipelines'] })
void queryClient.invalidateQueries({ queryKey: ['fulfillment-pending'] })
}
if (event.type === 'work_order.changed' && event.scopes.includes('admin_work_orders')) {
// 拼单明细是独立查询,工单列表快照更新时也要同步刷新当前打开的明细。
void queryClient.invalidateQueries({
@@ -1322,7 +1322,6 @@ function PipelinesPanel() {
const query = useQuery({
queryKey: ['fulfillment-pipelines'],
queryFn: fetchPipelineStatus,
refetchInterval: 30_000,
})
const runMutation = useMutation({
@@ -1338,7 +1337,7 @@ function PipelinesPanel() {
const columns = [
{ title: '管道', dataIndex: 'label', width: 130 },
{
title: '定时任务',
title: '兜底任务',
width: 150,
render: (_: unknown, row: FinancePipelineStatus) =>
row.scheduler ? (
@@ -1402,8 +1401,8 @@ function PipelinesPanel() {
}
>
<Typography.Paragraph type="secondary">
六个管道由定时任务自动执行,无需人工干预;这里只用于查看进度、
排障和补跑。默认间隔:渠道判定/载体 60s,商品/成本 300s,事实/总账 600s。
新订单会由入库事件即时推进渠道判定和载体补建;定时任务只做漏事件兜底。 本页随后台 SSE
自动刷新,用于查看进度、排障和补跑。
</Typography.Paragraph>
<PercentTable
rowKey="pipeline"
@@ -13,7 +13,6 @@ import { useParams } from 'react-router'
import {
confirmDouyuBinding,
fetchDouyuFulfillment,
pollDouyuBinding,
saveDouyuProfile,
startDouyuBinding,
} from '@/services/douyu-fulfillment'
@@ -23,8 +22,8 @@ import type {
DouyuCustomerSystem,
} from '@/types/douyu-fulfillment'
import { formatAdminDateTime } from '@/utils/admin-time'
import { useRealtimeEvents } from '@/hooks/useRealtimeEvents'
const POLL_INTERVAL_MS = 3000
const BINDING_FAILURE_ISSUES = new Set([
'binding_failed',
'account_role_cooldown',
@@ -129,27 +128,29 @@ export default function DouyuFulfillmentPage() {
void load()
}, [load])
useRealtimeEvents({
url: orderNo ? `/api/v1/douyu-fulfillment/${encodeURIComponent(orderNo)}/realtime` : '',
allowAnonymous: true,
onConnected: () => {
void load(true)
},
onResync: () => {
void load(true)
},
onEvent: (event) => {
if (
event.type === 'customer_order.changed' &&
event.scopes.includes(`customer_order:${orderNo}`)
) {
void load(true)
}
},
})
const task = data?.task
const live = data?.live
const needsProfile = Boolean(task && !task.customer_role_name)
const bindingFailed = Boolean(live && BINDING_FAILURE_ISSUES.has(live.issueCode))
const activeBinding = Boolean(
task &&
!needsProfile &&
!bindingFailed &&
!['completed', 'cancelled'].includes(task.status) &&
!live?.bindConfirmed,
)
useEffect(() => {
if (!activeBinding || !orderNo) return
const timer = window.setInterval(() => {
void pollDouyuBinding(orderNo)
.then((response) => applyData(response.data))
.catch(() => undefined)
}, POLL_INTERVAL_MS)
return () => window.clearInterval(timer)
}, [activeBinding, applyData, orderNo])
useEffect(() => {
const url = live?.qrUrl || ''
@@ -0,0 +1,36 @@
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))
function source(relativePath: string) {
return readFileSync(join(root, '..', relativePath), 'utf8')
}
test('斗鱼领取页使用订单级 SSE,不再固定 3 秒轮询绑定状态', () => {
const page = source('src/pages/douyu-fulfillment/DouyuFulfillmentPage.tsx')
assert.ok(page.includes('useRealtimeEvents'))
assert.ok(page.includes('/realtime'))
assert.ok(page.includes("event.type === 'customer_order.changed'"))
assert.ok(!page.includes('POLL_INTERVAL_MS'))
assert.ok(!page.includes('pollDouyuBinding('))
})
test('履约管道状态由后台 SSE 失效刷新,不再 30 秒轮询', () => {
const page = source('src/pages/admin/AdminFulfillmentChannelPage.tsx')
const layout = source('src/layouts/AdminLayout.tsx')
assert.ok(!page.includes('refetchInterval: 30_000'))
assert.match(page, /SSE\s+自动刷新/)
assert.ok(layout.includes("event.type === 'fulfillment_pipeline.changed'"))
assert.ok(layout.includes("queryKey: ['fulfillment-pipelines']"))
})
test('公共订单 SSE 允许匿名连接且只携带重读信号', () => {
const hook = source('src/hooks/useRealtimeEvents.ts')
assert.ok(hook.includes('allowAnonymous'))
assert.ok(hook.includes("| 'customer_order.changed'"))
assert.ok(hook.includes("| 'fulfillment_pipeline.changed'"))
})