Merge branch 'main' into dev
This commit is contained in:
@@ -355,10 +355,10 @@ export async function listKuaishouIndustryVouchersForAdmin(
|
||||
COALESCE(ft.task_no, '') AS task_no
|
||||
FROM kuaishou_industry_vouchers v
|
||||
LEFT JOIN fulfillment_tasks ft ON ft.id = v.task_id
|
||||
LEFT JOIN order_items oi_task ON oi_task.id = ft.order_item_id
|
||||
LEFT JOIN v_order_item_current oi_task ON oi_task.id = ft.order_item_id
|
||||
LEFT JOIN LATERAL (
|
||||
SELECT oi.sku_code, oi.sku_name
|
||||
FROM order_items oi
|
||||
FROM v_order_item_current oi
|
||||
WHERE v.order_id IS NOT NULL
|
||||
AND oi.order_id = v.order_id
|
||||
ORDER BY oi.id ASC
|
||||
|
||||
@@ -186,7 +186,7 @@ test('已分配订单重推写库时不会用平台新 SKU 覆盖冻结值', asy
|
||||
let selectCount = 0
|
||||
|
||||
const executor = async (sql: string, params: unknown[] = []) => {
|
||||
if (sql.includes('SELECT *') && sql.includes('FROM order_items')) {
|
||||
if (sql.includes('SELECT *') && sql.includes('FROM v_order_item_current')) {
|
||||
selectCount += 1
|
||||
return { rows: selectCount === 1 ? [existing] : [] }
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@ export async function listOrderItemsByOrderIds(orderIds: number[]): Promise<Orde
|
||||
const result = await query<OrderItemRow>(
|
||||
`
|
||||
SELECT *
|
||||
FROM order_items
|
||||
FROM v_order_item_current
|
||||
WHERE order_id = ANY($1::bigint[])
|
||||
ORDER BY order_id ASC, id ASC
|
||||
`,
|
||||
@@ -316,7 +316,7 @@ async function listDeletableOrderItemIdsWithExecutor(
|
||||
const result = await executor(
|
||||
`
|
||||
SELECT oi.id
|
||||
FROM order_items oi
|
||||
FROM v_order_item_current oi
|
||||
LEFT JOIN fulfillment_tasks ft ON ft.order_item_id = oi.id
|
||||
WHERE oi.id = ANY($1::bigint[])
|
||||
GROUP BY oi.id
|
||||
@@ -336,7 +336,7 @@ async function listOrderItemsByOrderIdWithExecutor(
|
||||
const result = await executor(
|
||||
`
|
||||
SELECT *
|
||||
FROM order_items
|
||||
FROM v_order_item_current
|
||||
WHERE order_id = $1
|
||||
ORDER BY id ASC
|
||||
`,
|
||||
@@ -347,9 +347,10 @@ async function listOrderItemsByOrderIdWithExecutor(
|
||||
}
|
||||
|
||||
export async function getOrderItemById(orderItemId: number | string): Promise<OrderItemRow | null> {
|
||||
const result = await query<OrderItemRow>('SELECT * FROM order_items WHERE id = $1 LIMIT 1', [
|
||||
Number(orderItemId),
|
||||
])
|
||||
const result = await query<OrderItemRow>(
|
||||
'SELECT * FROM v_order_item_current WHERE id = $1 LIMIT 1',
|
||||
[Number(orderItemId)],
|
||||
)
|
||||
return result.rows[0] || null
|
||||
}
|
||||
|
||||
@@ -358,9 +359,17 @@ export async function updateOrderItemSourceSnapshot(
|
||||
input: { skuName: string; itemSnapshotJson: string; updatedAt: string; specJson?: string },
|
||||
): Promise<OrderItemRow | null> {
|
||||
return withTransaction(async (client) => {
|
||||
const id = Number(orderItemId)
|
||||
const orderItemLock = await client.query<{ id: number }>(
|
||||
`SELECT id FROM order_items WHERE id = $1 FOR UPDATE`,
|
||||
[id],
|
||||
)
|
||||
if (!orderItemLock.rows[0]) return null
|
||||
await client.query(`SELECT id FROM fulfillments WHERE order_item_id = $1 FOR UPDATE`, [id])
|
||||
|
||||
const selected = await client.query<OrderItemRow>(
|
||||
`SELECT * FROM order_items WHERE id = $1 FOR UPDATE`,
|
||||
[Number(orderItemId)],
|
||||
`SELECT * FROM v_order_item_current WHERE id = $1`,
|
||||
[id],
|
||||
)
|
||||
const existing = selected.rows[0]
|
||||
if (!existing) return null
|
||||
|
||||
@@ -107,8 +107,8 @@ test('订单列表按当前履约模式筛选,不再依赖任务执行器', as
|
||||
channel: 'manual',
|
||||
})
|
||||
|
||||
assert.match(calls[0]?.sql || '', /oi\.fulfillment_channel = \$1/)
|
||||
assert.match(calls[0]?.sql || '', /oi\.fulfillment_channel IS DISTINCT FROM \$1/)
|
||||
assert.match(calls[0]?.sql || '', /fulfillment\.channel = \$1/)
|
||||
assert.match(calls[0]?.sql || '', /fulfillment\.channel IS DISTINCT FROM \$1/)
|
||||
assert.doesNotMatch(calls[0]?.sql || '', /COUNT\(DISTINCT/)
|
||||
assert.doesNotMatch(calls[0]?.sql || '', /ft\.executor_key/)
|
||||
assert.deepEqual(calls[0]?.params, ['manual'])
|
||||
@@ -122,7 +122,7 @@ test('订单列表待判定筛选不扫描任务执行器', async () => {
|
||||
})
|
||||
|
||||
assert.match(calls[0]?.sql || '', /EXISTS/)
|
||||
assert.match(calls[0]?.sql || '', /oi\.fulfillment_status = 'pending'/)
|
||||
assert.match(calls[0]?.sql || '', /fulfillment\.status = 'pending'/)
|
||||
assert.doesNotMatch(calls[0]?.sql || '', /COUNT\(DISTINCT/)
|
||||
assert.deepEqual(calls[0]?.params, [])
|
||||
})
|
||||
@@ -134,7 +134,7 @@ test('订单列表历史平台筛选映射为 archived', async () => {
|
||||
channel: 'legacy_platform',
|
||||
})
|
||||
|
||||
assert.match(calls[0]?.sql || '', /oi\.fulfillment_status = 'archived'/)
|
||||
assert.match(calls[0]?.sql || '', /fulfillment\.status = 'archived'/)
|
||||
assert.deepEqual(calls[0]?.params, [])
|
||||
})
|
||||
|
||||
@@ -145,7 +145,7 @@ test('订单列表混合履约筛选按订单项聚合判定', async () => {
|
||||
channel: 'mixed',
|
||||
})
|
||||
|
||||
assert.match(calls[0]?.sql || '', /HAVING COUNT\(DISTINCT oi\.fulfillment_channel\) > 1/)
|
||||
assert.match(calls[0]?.sql || '', /HAVING COUNT\(DISTINCT fulfillment\.channel\) > 1/)
|
||||
assert.deepEqual(calls[0]?.params, [])
|
||||
})
|
||||
|
||||
|
||||
@@ -279,7 +279,7 @@ export async function listOrdersWithExecutor(
|
||||
) ILIKE ${keywordParam}
|
||||
OR EXISTS (
|
||||
SELECT 1
|
||||
FROM order_items oi
|
||||
FROM v_order_item_current oi
|
||||
WHERE oi.order_id = o.id
|
||||
AND (
|
||||
(
|
||||
@@ -339,36 +339,36 @@ export async function listOrdersWithExecutor(
|
||||
const normalizedMode = channel === 'legacy_platform' ? 'archived' : channel
|
||||
if (normalizedMode === 'pending') {
|
||||
filters.push(`EXISTS (
|
||||
SELECT 1 FROM order_items oi
|
||||
WHERE oi.order_id = o.id AND oi.fulfillment_status = 'pending'
|
||||
SELECT 1 FROM fulfillments fulfillment
|
||||
WHERE fulfillment.order_id = o.id AND fulfillment.status = 'pending'
|
||||
)`)
|
||||
} else if (normalizedMode === 'archived') {
|
||||
filters.push(`EXISTS (
|
||||
SELECT 1 FROM order_items oi
|
||||
WHERE oi.order_id = o.id AND oi.fulfillment_status = 'archived'
|
||||
SELECT 1 FROM fulfillments fulfillment
|
||||
WHERE fulfillment.order_id = o.id AND fulfillment.status = 'archived'
|
||||
)`)
|
||||
} else if (normalizedMode === 'mixed') {
|
||||
filters.push(`o.id IN (
|
||||
SELECT oi.order_id FROM order_items oi
|
||||
WHERE oi.fulfillment_status = 'assigned'
|
||||
GROUP BY oi.order_id
|
||||
HAVING COUNT(DISTINCT oi.fulfillment_channel) > 1
|
||||
SELECT fulfillment.order_id FROM fulfillments fulfillment
|
||||
WHERE fulfillment.status = 'assigned'
|
||||
GROUP BY fulfillment.order_id
|
||||
HAVING COUNT(DISTINCT fulfillment.channel) > 1
|
||||
)`)
|
||||
} else {
|
||||
params.push(normalizedMode)
|
||||
const modeParam = `$${params.length}`
|
||||
filters.push(`(
|
||||
EXISTS (
|
||||
SELECT 1 FROM order_items oi
|
||||
WHERE oi.order_id = o.id
|
||||
AND oi.fulfillment_status = 'assigned'
|
||||
AND oi.fulfillment_channel = ${modeParam}
|
||||
SELECT 1 FROM fulfillments fulfillment
|
||||
WHERE fulfillment.order_id = o.id
|
||||
AND fulfillment.status = 'assigned'
|
||||
AND fulfillment.channel = ${modeParam}
|
||||
)
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM order_items oi
|
||||
WHERE oi.order_id = o.id
|
||||
AND oi.fulfillment_status = 'assigned'
|
||||
AND oi.fulfillment_channel IS DISTINCT FROM ${modeParam}
|
||||
SELECT 1 FROM fulfillments fulfillment
|
||||
WHERE fulfillment.order_id = o.id
|
||||
AND fulfillment.status = 'assigned'
|
||||
AND fulfillment.channel IS DISTINCT FROM ${modeParam}
|
||||
)
|
||||
)`)
|
||||
}
|
||||
@@ -377,7 +377,7 @@ export async function listOrdersWithExecutor(
|
||||
if (skuCode) {
|
||||
params.push(skuCode)
|
||||
filters.push(
|
||||
`EXISTS (SELECT 1 FROM order_items oi WHERE oi.order_id = o.id AND oi.sku_code = $${params.length})`,
|
||||
`EXISTS (SELECT 1 FROM v_order_item_current oi WHERE oi.order_id = o.id AND oi.sku_code = $${params.length})`,
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -167,10 +167,10 @@ export async function listRedeemCertificatesForAdmin(
|
||||
ORDER BY ft.id ASC
|
||||
LIMIT 1
|
||||
) ft ON true
|
||||
LEFT JOIN order_items oi_task ON oi_task.id = ft.order_item_id
|
||||
LEFT JOIN v_order_item_current oi_task ON oi_task.id = ft.order_item_id
|
||||
LEFT JOIN LATERAL (
|
||||
SELECT oi.sku_code, oi.sku_name
|
||||
FROM order_items oi
|
||||
FROM v_order_item_current oi
|
||||
WHERE c.local_order_id IS NOT NULL
|
||||
AND oi.order_id = c.local_order_id
|
||||
ORDER BY oi.id ASC
|
||||
|
||||
@@ -96,7 +96,9 @@ export async function createTask(input: TaskCreateInput): Promise<TaskRow | null
|
||||
return withTransaction(async (client) => {
|
||||
// 同一订单项单元的创建必须串行,否则并发调度会同时算出同一尝试号,
|
||||
// 再一起绕过“仅一个当前尝试”的唯一索引。
|
||||
await client.query(`SELECT id FROM order_items WHERE id = $1 FOR UPDATE`, [input.orderItemId])
|
||||
await client.query(`SELECT id FROM fulfillments WHERE order_item_id = $1 FOR UPDATE`, [
|
||||
input.orderItemId,
|
||||
])
|
||||
const active = await client.query<{ id: number }>(
|
||||
`SELECT id
|
||||
FROM fulfillment_tasks
|
||||
@@ -483,7 +485,7 @@ export async function listTasks({
|
||||
const itemsParams = [...params, pageSize, offset]
|
||||
const itemsResult = await query<TaskRow>(
|
||||
`${buildTaskSelect('oi.sku_code, oi.sku_name, oi.quantity')}
|
||||
LEFT JOIN order_items oi ON oi.id = ft.order_item_id
|
||||
LEFT JOIN v_order_item_current oi ON oi.id = ft.order_item_id
|
||||
${whereClause}
|
||||
ORDER BY ft.id DESC
|
||||
LIMIT $${itemsParams.length - 1} OFFSET $${itemsParams.length}`,
|
||||
@@ -504,7 +506,7 @@ export async function listTasks({
|
||||
const needsJoinKcts = whereClause.includes('kcts.')
|
||||
const joinClauses: string[] = []
|
||||
if (needsJoinOi) {
|
||||
joinClauses.push('LEFT JOIN order_items oi ON oi.id = ft.order_item_id')
|
||||
joinClauses.push('LEFT JOIN v_order_item_current oi ON oi.id = ft.order_item_id')
|
||||
}
|
||||
if (needsJoinCtx) {
|
||||
joinClauses.push('LEFT JOIN task_runtime_contexts ctx ON ctx.task_id = ft.id')
|
||||
|
||||
Reference in New Issue
Block a user