merge(douyu): 合入领取订单匹配起算时间
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
node_modules
|
||||
AGENTS.md
|
||||
.env
|
||||
.env copy
|
||||
.env.local
|
||||
|
||||
@@ -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
|
||||
'只同步该时间之后支付的订单,避免历史人工单进入斗鱼领取工作台';
|
||||
@@ -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<string, unknown>), {
|
||||
|
||||
@@ -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<DouyuFulfillmentSettingsRow>(
|
||||
`
|
||||
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<DouyuFulfillmentSettingsRow>(
|
||||
`
|
||||
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<DouyuTaskRow>(
|
||||
`${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(`(
|
||||
|
||||
@@ -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<Dayjs | null>(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() {
|
||||
>
|
||||
立即同步
|
||||
</Button>
|
||||
<Button icon={<SettingOutlined />} onClick={openSettings}>
|
||||
匹配设置
|
||||
</Button>
|
||||
<Button icon={<ReloadOutlined />} onClick={() => void listQuery.refetch()}>
|
||||
刷新
|
||||
</Button>
|
||||
@@ -316,6 +351,29 @@ export default function AdminDouyuFulfillmentPage() {
|
||||
/>
|
||||
</Card>
|
||||
|
||||
<Modal
|
||||
open={settingsOpen}
|
||||
title="斗鱼领取匹配设置"
|
||||
okText="保存"
|
||||
confirmLoading={settingsMutation.isPending}
|
||||
onOk={() => {
|
||||
if (orderMatchStartedAt) settingsMutation.mutate(orderMatchStartedAt)
|
||||
}}
|
||||
onCancel={() => setSettingsOpen(false)}
|
||||
>
|
||||
<Space direction="vertical" size={10} style={{ width: '100%' }}>
|
||||
<Text>只匹配该时间之后支付的订单</Text>
|
||||
<DatePicker
|
||||
showTime
|
||||
allowClear={false}
|
||||
value={orderMatchStartedAt}
|
||||
onChange={setOrderMatchStartedAt}
|
||||
format="YYYY-MM-DD HH:mm:ss"
|
||||
style={{ width: '100%' }}
|
||||
/>
|
||||
</Space>
|
||||
</Modal>
|
||||
|
||||
<Drawer
|
||||
open={Boolean(detailOrderNo)}
|
||||
width="min(980px, 94vw)"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { apiGet, apiPost } from '@/lib/http'
|
||||
import { apiGet, apiPost, apiPut } from '@/lib/http'
|
||||
import type { DouyuFulfillmentDetail, DouyuFulfillmentTask } from '@/types/douyu-fulfillment'
|
||||
|
||||
export function fetchAdminDouyuFulfillmentTasks(params: {
|
||||
@@ -13,6 +13,20 @@ export function fetchAdminDouyuFulfillmentTasks(params: {
|
||||
}>('/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',
|
||||
|
||||
Reference in New Issue
Block a user