重构:硬切履约状态唯一真源
This commit is contained in:
@@ -81,7 +81,7 @@ export async function listOrderRefunds(orderId: number | string): Promise<OrderR
|
||||
oi.sku_name,
|
||||
COALESCE(NULLIF(u.display_name, ''), u.username, '') AS operator_name
|
||||
FROM order_refunds r
|
||||
LEFT JOIN order_items oi ON oi.id = r.order_item_id
|
||||
LEFT JOIN v_order_item_current oi ON oi.id = r.order_item_id
|
||||
LEFT JOIN admin_users u ON u.id = r.operator_admin_user_id
|
||||
WHERE r.order_id = $1
|
||||
ORDER BY r.refunded_at DESC, r.id DESC
|
||||
@@ -144,7 +144,7 @@ export async function createManualRefund(
|
||||
})
|
||||
}
|
||||
const activeItems = await client.query<{ total: number }>(
|
||||
`SELECT COUNT(*)::int AS total FROM order_items
|
||||
`SELECT COUNT(*)::int AS total FROM v_order_item_current
|
||||
WHERE order_id = $1 AND fulfillment_status <> 'archived'`,
|
||||
[orderId],
|
||||
)
|
||||
@@ -170,7 +170,7 @@ export async function createManualRefund(
|
||||
FROM order_refunds r
|
||||
WHERE r.order_item_id = oi.id AND r.status = 'confirmed'
|
||||
), 0)::bigint AS refunded_fen
|
||||
FROM order_items oi
|
||||
FROM v_order_item_current oi
|
||||
WHERE oi.order_id = $1
|
||||
ORDER BY oi.id
|
||||
`,
|
||||
@@ -286,7 +286,7 @@ export async function createManualRefund(
|
||||
JOIN order_items ri ON ri.id = r.order_item_id
|
||||
WHERE ri.order_id = $1 AND r.status = 'confirmed'
|
||||
), 0)::bigint AS refunded_fen
|
||||
FROM order_items oi
|
||||
FROM v_order_item_current oi
|
||||
WHERE oi.order_id = $1
|
||||
`,
|
||||
[orderId],
|
||||
@@ -407,7 +407,7 @@ export async function voidOrderRefund(
|
||||
})
|
||||
}
|
||||
const activeItems = await client.query<{ total: number }>(
|
||||
`SELECT COUNT(*)::int AS total FROM order_items
|
||||
`SELECT COUNT(*)::int AS total FROM v_order_item_current
|
||||
WHERE order_id = $1 AND fulfillment_status <> 'archived'`,
|
||||
[row.order_id],
|
||||
)
|
||||
@@ -440,7 +440,7 @@ export async function voidOrderRefund(
|
||||
JOIN order_items ri ON ri.id = r.order_item_id
|
||||
WHERE ri.order_id = $1 AND r.status = 'confirmed'
|
||||
), 0)::bigint AS refunded_fen
|
||||
FROM order_items oi
|
||||
FROM v_order_item_current oi
|
||||
WHERE oi.order_id = $1
|
||||
`,
|
||||
[row.order_id],
|
||||
@@ -605,7 +605,7 @@ async function refreshActiveRefundFacts(itemIds: number[], basisDate: string): P
|
||||
const ids = [...new Set(itemIds.filter((id) => Number.isInteger(id) && id > 0))]
|
||||
if (ids.length === 0 || !basisDate) return
|
||||
const active = await query<{ total: number }>(
|
||||
`SELECT COUNT(*)::int AS total FROM order_items
|
||||
`SELECT COUNT(*)::int AS total FROM v_order_item_current
|
||||
WHERE id = ANY($1::bigint[]) AND fulfillment_status <> 'archived'`,
|
||||
[ids],
|
||||
)
|
||||
@@ -684,7 +684,10 @@ export async function approveAndRecordKuaishouRefund(
|
||||
}
|
||||
|
||||
const existingItem = await query<{ id: number; fulfillment_status: string }>(
|
||||
`SELECT id, fulfillment_status FROM order_items WHERE id = $1 AND order_id = $2 LIMIT 1`,
|
||||
`SELECT id, fulfillment_status
|
||||
FROM v_order_item_current
|
||||
WHERE id = $1 AND order_id = $2
|
||||
LIMIT 1`,
|
||||
[orderItemId, orderId],
|
||||
)
|
||||
if (!existingItem.rows[0]) {
|
||||
@@ -897,7 +900,7 @@ async function getRefundableFen(orderId: number, orderItemId: number): Promise<n
|
||||
FROM order_refunds r
|
||||
WHERE r.order_item_id = oi.id AND r.status = 'confirmed'
|
||||
), 0))::bigint AS remaining_fen
|
||||
FROM order_items oi
|
||||
FROM v_order_item_current oi
|
||||
WHERE oi.id = $1 AND oi.order_id = $2
|
||||
LIMIT 1
|
||||
`,
|
||||
|
||||
Reference in New Issue
Block a user