feat(admin): 收口人工履约入口并修复履约筛选

This commit is contained in:
yml2213
2026-10-24 17:42:07 +08:00
parent faf56e567e
commit 790de676c6
27 changed files with 495 additions and 1327 deletions
@@ -100,6 +100,44 @@ test('订单列表 platformOrderId 为拼多多 order_sn 时走索引快路径',
assert.deepEqual(calls[0]?.params, [orderSn])
})
test('订单列表按当前履约模式筛选,不再依赖任务执行器', async () => {
const calls: Array<{ sql: string; params: unknown[] }> = []
await listOrdersWithExecutor(createExecutor(calls, 0), {
fulfillmentMode: 'manual',
})
assert.match(calls[0]?.sql || '', /oi\.fulfillment_mode = \$1/)
assert.match(calls[0]?.sql || '', /oi\.fulfillment_mode <> \$1/)
assert.doesNotMatch(calls[0]?.sql || '', /COUNT\(DISTINCT/)
assert.doesNotMatch(calls[0]?.sql || '', /ft\.executor_key/)
assert.deepEqual(calls[0]?.params, ['manual'])
})
test('订单列表待判定筛选不扫描任务执行器', async () => {
const calls: Array<{ sql: string; params: unknown[] }> = []
await listOrdersWithExecutor(createExecutor(calls, 0), {
fulfillmentMode: 'pending',
})
assert.match(calls[0]?.sql || '', /NOT EXISTS/)
assert.match(calls[0]?.sql || '', /oi\.fulfillment_mode IN/)
assert.doesNotMatch(calls[0]?.sql || '', /COUNT\(DISTINCT/)
assert.deepEqual(calls[0]?.params, [])
})
test('订单列表混合履约筛选按订单项聚合判定', async () => {
const calls: Array<{ sql: string; params: unknown[] }> = []
await listOrdersWithExecutor(createExecutor(calls, 0), {
fulfillmentMode: 'mixed',
})
assert.match(calls[0]?.sql || '', /HAVING COUNT\(DISTINCT oi\.fulfillment_mode\) > 1/)
assert.deepEqual(calls[0]?.params, [])
})
function createExecutor(
calls: Array<{ sql: string; params: unknown[] }>,
total: number,
@@ -240,6 +240,7 @@ export async function listOrdersWithExecutor(
keyword = '',
provider = '',
executorKey = '',
fulfillmentMode = '',
platformOrderId = '',
payStatus = '',
taskStatus = '',
@@ -333,6 +334,38 @@ export async function listOrdersWithExecutor(
)
}
if (fulfillmentMode) {
const knownModes = `('work_order', 'affiliate_dash', 'legacy_platform', 'manual')`
if (fulfillmentMode === 'pending') {
filters.push(`NOT EXISTS (
SELECT 1 FROM order_items oi
WHERE oi.order_id = o.id AND oi.fulfillment_mode IN ${knownModes}
)`)
} else if (fulfillmentMode === 'mixed') {
filters.push(`o.id IN (
SELECT oi.order_id FROM order_items oi
WHERE oi.fulfillment_mode IN ${knownModes}
GROUP BY oi.order_id
HAVING COUNT(DISTINCT oi.fulfillment_mode) > 1
)`)
} else {
params.push(fulfillmentMode)
const modeParam = `$${params.length}`
filters.push(`(
EXISTS (
SELECT 1 FROM order_items oi
WHERE oi.order_id = o.id AND oi.fulfillment_mode = ${modeParam}
)
AND NOT EXISTS (
SELECT 1 FROM order_items oi
WHERE oi.order_id = o.id
AND oi.fulfillment_mode IN ${knownModes}
AND oi.fulfillment_mode <> ${modeParam}
)
)`)
}
}
if (skuCode) {
params.push(skuCode)
filters.push(