From 30ec68b48ec741098551cb428016c5785f0d05da Mon Sep 17 00:00:00 2001 From: yml Date: Wed, 18 Nov 2026 13:58:35 +0800 Subject: [PATCH] =?UTF-8?q?feat(douyu):=20=E5=A2=9E=E5=8A=A0=E9=A2=86?= =?UTF-8?q?=E5=8F=96=E8=AE=A2=E5=8D=95=E5=8C=B9=E9=85=8D=E8=B5=B7=E7=AE=97?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .../175_douyu_fulfillment_order_cutoff.sql | 17 ++++ .../src/routes/admin/douyu-fulfillment.ts | 26 ++++++ .../douyu-fulfillment-service.ts | 80 +++++++++++++++++-- .../pages/admin/AdminDouyuFulfillmentPage.tsx | 58 ++++++++++++++ .../src/services/admin/douyu-fulfillment.ts | 16 +++- 6 files changed, 190 insertions(+), 8 deletions(-) create mode 100644 apps/backend/src/db/migrations/175_douyu_fulfillment_order_cutoff.sql diff --git a/.gitignore b/.gitignore index c0e60876..5b909ba7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ node_modules +AGENTS.md .env .env copy .env.local diff --git a/apps/backend/src/db/migrations/175_douyu_fulfillment_order_cutoff.sql b/apps/backend/src/db/migrations/175_douyu_fulfillment_order_cutoff.sql new file mode 100644 index 00000000..45a62a04 --- /dev/null +++ b/apps/backend/src/db/migrations/175_douyu_fulfillment_order_cutoff.sql @@ -0,0 +1,17 @@ +-- 175_douyu_fulfillment_order_cutoff.sql +-- +-- 斗鱼领取工作台只处理启用后的订单。此前按“所有启用了斗鱼领取的 manual +-- fulfillment”回填,会把大量历史人工单重新投影进领取工作台。 + +CREATE TABLE IF NOT EXISTS douyu_fulfillment_settings ( + id SMALLINT PRIMARY KEY CHECK (id = 1), + order_match_started_at TIMESTAMPTZ NOT NULL DEFAULT NOW(), + updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW() +); + +INSERT INTO douyu_fulfillment_settings (id, order_match_started_at, updated_at) +VALUES (1, NOW(), NOW()) +ON CONFLICT (id) DO NOTHING; + +COMMENT ON COLUMN douyu_fulfillment_settings.order_match_started_at IS + '只同步该时间之后支付的订单,避免历史人工单进入斗鱼领取工作台'; diff --git a/apps/backend/src/routes/admin/douyu-fulfillment.ts b/apps/backend/src/routes/admin/douyu-fulfillment.ts index 8151a404..ff0b4006 100644 --- a/apps/backend/src/routes/admin/douyu-fulfillment.ts +++ b/apps/backend/src/routes/admin/douyu-fulfillment.ts @@ -1,11 +1,13 @@ import { Router } from 'express' import { + getDouyuFulfillmentSettings, getDouyuFulfillmentDetail, listDouyuFulfillmentTasks, refreshDouyuCustomerBinding, startDouyuCustomerBinding, syncDouyuFulfillmentTasks, + updateDouyuFulfillmentSettings, } from '../../services/douyu-fulfillment/douyu-fulfillment-service.js' import { createJsonHandler, requireAdminRoles } from './session.js' @@ -13,6 +15,30 @@ const router = Router() router.use('/douyu-fulfillment', requireAdminRoles(['admin', 'operator', 'support'])) +router.get( + '/douyu-fulfillment/settings', + createJsonHandler(() => getDouyuFulfillmentSettings(), { + successMessage: 'ok', + errorMessage: '读取斗鱼领取设置失败', + scope: '[admin/douyu-fulfillment/settings]', + }), +) + +router.put( + '/douyu-fulfillment/settings', + createJsonHandler((req) => updateDouyuFulfillmentSettings(req.body || {}), { + successMessage: '斗鱼领取设置已更新', + errorMessage: '更新斗鱼领取设置失败', + scope: '[admin/douyu-fulfillment/settings]', + audit: () => ({ + action: 'douyu_fulfillment_settings_updated', + targetType: 'douyu_fulfillment_settings', + targetId: '1', + data: {}, + }), + }), +) + router.get( '/douyu-fulfillment/tasks', createJsonHandler((req) => listDouyuFulfillmentTasks(req.query as Record), { 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 01d31bb0..24a0bc12 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,11 @@ type LiveBindingBatchResponse = { items: LiveBindingState[] } +type DouyuFulfillmentSettingsRow = { + order_match_started_at: string + updated_at: string +} + const AUTO_DISCOVERY_INTERVAL_MS = 15_000 const LIVE_STATE_SYNC_INTERVAL_MS = 60_000 const TERMINAL_TASK_STATUSES = new Set(['completed', 'cancelled']) @@ -104,6 +109,63 @@ function liveHubBaseUrl() { .replace(/\/+$/, '') } +export async function getDouyuFulfillmentSettings() { + const result = await query( + ` + INSERT INTO douyu_fulfillment_settings ( + id, order_match_started_at, updated_at + ) VALUES (1, NOW(), NOW()) + ON CONFLICT (id) DO UPDATE SET id = EXCLUDED.id + RETURNING order_match_started_at, updated_at + `, + ) + const row = result.rows[0] + if (!row) { + throw createHttpError('斗鱼领取设置初始化失败', { + statusCode: 500, + errorCode: 'douyu_fulfillment_settings_missing', + }) + } + return { + orderMatchStartedAt: row.order_match_started_at, + updatedAt: row.updated_at, + } +} + +export async function updateDouyuFulfillmentSettings(input: { orderMatchStartedAt?: unknown }) { + const raw = String(input.orderMatchStartedAt || '').trim() + const startedAt = new Date(raw) + if (!raw || Number.isNaN(startedAt.getTime())) { + throw createHttpError('请选择有效的订单匹配起算时间', { + statusCode: 400, + errorCode: 'douyu_fulfillment_cutoff_invalid', + }) + } + const result = await query( + ` + INSERT INTO douyu_fulfillment_settings ( + id, order_match_started_at, updated_at + ) VALUES (1, $1::timestamptz, NOW()) + ON CONFLICT (id) DO UPDATE SET + order_match_started_at = EXCLUDED.order_match_started_at, + updated_at = NOW() + RETURNING order_match_started_at, updated_at + `, + [startedAt.toISOString()], + ) + const row = result.rows[0] + if (!row) { + throw createHttpError('斗鱼领取设置保存失败', { + statusCode: 500, + errorCode: 'douyu_fulfillment_settings_missing', + }) + } + return { + orderMatchStartedAt: row.order_match_started_at, + updatedAt: row.updated_at, + } +} + function integrationKey() { const key = String(process.env.PLATFORM_FULFILLMENT_INTEGRATION_KEY || '').trim() if (!key) { @@ -166,12 +228,13 @@ async function appendEvent( } export async function ensureDouyuFulfillmentTasks(orderNo = '') { - const params: unknown[] = [] - let filter = '' + const settings = await getDouyuFulfillmentSettings() + const params: unknown[] = [settings.orderMatchStartedAt] + const filters = ['AND COALESCE(o.paid_at, o.created_at) >= $1::timestamptz'] const normalizedOrderNo = String(orderNo || '').trim() if (normalizedOrderNo) { params.push(normalizedOrderNo) - filter = 'AND o.platform_order_id = $1' + filters.push(`AND o.platform_order_id = $${params.length}`) } const candidates = await query<{ order_id: number @@ -195,7 +258,7 @@ export async function ensureDouyuFulfillmentTasks(orderNo = '') { AND cfg.douyu_fulfillment_enabled = TRUE AND f.channel = 'manual' AND f.status IN ('assigned', 'processing', 'completed') - ${filter} + ${filters.join('\n ')} ORDER BY o.id DESC, oi.id ASC `, params, @@ -264,12 +327,14 @@ async function loadTaskByOrderNo(orderNo: string) { }) } await ensureDouyuFulfillmentTasks(normalized) + const settings = await getDouyuFulfillmentSettings() const result = await query( `${TASK_SELECT} WHERE o.platform_order_id = $1 + AND COALESCE(o.paid_at, o.created_at) >= $2::timestamptz ORDER BY task.id ASC LIMIT 1`, - [normalized], + [normalized, settings.orderMatchStartedAt], ) const task = result.rows[0] if (!task) { @@ -804,8 +869,9 @@ export async function listDouyuFulfillmentTasks( const pageSize = Math.max(1, Math.min(100, Number(input.pageSize || 20))) const keyword = String(input.keyword || '').trim() const status = String(input.status || '').trim() - const params: unknown[] = [] - const filters: string[] = [] + const settings = await getDouyuFulfillmentSettings() + const params: unknown[] = [settings.orderMatchStartedAt] + const filters: string[] = ['COALESCE(o.paid_at, o.created_at) >= $1::timestamptz'] if (keyword) { params.push(`%${keyword}%`) filters.push(`( diff --git a/apps/frontend/src/pages/admin/AdminDouyuFulfillmentPage.tsx b/apps/frontend/src/pages/admin/AdminDouyuFulfillmentPage.tsx index 3a59d180..7826affd 100644 --- a/apps/frontend/src/pages/admin/AdminDouyuFulfillmentPage.tsx +++ b/apps/frontend/src/pages/admin/AdminDouyuFulfillmentPage.tsx @@ -2,6 +2,7 @@ import { CopyOutlined, LinkOutlined, ReloadOutlined, + SettingOutlined, SyncOutlined, ThunderboltOutlined, } from '@ant-design/icons' @@ -10,9 +11,11 @@ import { App, Button, Card, + DatePicker, Descriptions, Drawer, Input, + Modal, Select, Space, Tag, @@ -27,13 +30,16 @@ import PageHeader from '@/components/admin/PageHeader' import PercentTable from '@/components/common/PercentTable' import { fetchAdminDouyuFulfillmentDetail, + fetchAdminDouyuFulfillmentSettings, fetchAdminDouyuFulfillmentTasks, refreshAdminDouyuBinding, restartAdminDouyuBinding, syncAdminDouyuFulfillmentTasks, + updateAdminDouyuFulfillmentSettings, } from '@/services/admin' import type { DouyuFulfillmentTask } from '@/types/douyu-fulfillment' import { formatAdminDateTime } from '@/utils/admin-time' +import dayjs, { type Dayjs } from '@/lib/dayjs' const { Text } = Typography @@ -93,6 +99,8 @@ export default function AdminDouyuFulfillmentPage() { const [page, setPage] = useState(1) const [pageSize, setPageSize] = useState(20) const [detailOrderNo, setDetailOrderNo] = useState('') + const [settingsOpen, setSettingsOpen] = useState(false) + const [orderMatchStartedAt, setOrderMatchStartedAt] = useState(null) const listQuery = useQuery({ queryKey: ['admin-douyu-fulfillment', keyword, status, page, pageSize], @@ -109,6 +117,10 @@ export default function AdminDouyuFulfillmentPage() { queryFn: () => fetchAdminDouyuFulfillmentDetail(detailOrderNo), enabled: Boolean(detailOrderNo), }) + const settingsQuery = useQuery({ + queryKey: ['admin-douyu-fulfillment-settings'], + queryFn: fetchAdminDouyuFulfillmentSettings, + }) const list = listQuery.data?.data.items || [] const pagination = listQuery.data?.data.pagination @@ -143,6 +155,26 @@ export default function AdminDouyuFulfillmentPage() { }, onError: (error) => message.error(error instanceof Error ? error.message : '刷新失败'), }) + const settingsMutation = useMutation({ + mutationFn: (value: Dayjs) => updateAdminDouyuFulfillmentSettings(value.toISOString()), + onSuccess: async () => { + message.success('订单匹配起算时间已更新') + setSettingsOpen(false) + await Promise.all([ + queryClient.invalidateQueries({ queryKey: ['admin-douyu-fulfillment'] }), + queryClient.invalidateQueries({ + queryKey: ['admin-douyu-fulfillment-settings'], + }), + ]) + }, + onError: (error) => message.error(error instanceof Error ? error.message : '更新设置失败'), + }) + + function openSettings() { + const configured = settingsQuery.data?.data.orderMatchStartedAt + setOrderMatchStartedAt(configured ? dayjs(configured) : dayjs()) + setSettingsOpen(true) + } const restartMutation = useMutation({ mutationFn: restartAdminDouyuBinding, onSuccess: async () => { @@ -293,6 +325,9 @@ export default function AdminDouyuFulfillmentPage() { > 立即同步 + @@ -316,6 +351,29 @@ export default function AdminDouyuFulfillmentPage() { /> + { + if (orderMatchStartedAt) settingsMutation.mutate(orderMatchStartedAt) + }} + onCancel={() => setSettingsOpen(false)} + > + + 只匹配该时间之后支付的订单 + + + + ('/api/v1/admin/douyu-fulfillment/tasks', { params }) } +export function fetchAdminDouyuFulfillmentSettings() { + return apiGet<{ + orderMatchStartedAt: string + updatedAt: string + }>('/api/v1/admin/douyu-fulfillment/settings') +} + +export function updateAdminDouyuFulfillmentSettings(orderMatchStartedAt: string) { + return apiPut<{ + orderMatchStartedAt: string + updatedAt: string + }>('/api/v1/admin/douyu-fulfillment/settings', { orderMatchStartedAt }) +} + export function syncAdminDouyuFulfillmentTasks() { return apiPost<{ created: number; updated: number; checked: number }>( '/api/v1/admin/douyu-fulfillment/sync',