feat(finance): 补齐自动发货与接单平台成本和对账

自动发货:价格导入支持 --effective-from,把首次基线版本回填到历史起点;41,676 个订单项全部归一并生成采购成本快照,缺失 0。\n\n接单平台:新增按工单 product_rule_id 回填商品的接口与按钮,长尾项按 provider+shop_id+sku_code+normalized_sku_name 补建 wo: 商品和 sku_code_name 渠道映射;118,053 个订单项全部归一。\n\n成本:已验收工单按 reward_amount 写 actual;未验收但已确定报酬的工单写 estimated,验收后升级。全量 95,870 actual + 21,217 estimated,actual 与 reward 0 差异。\n\n剩余 966 条取消/零报酬工单保留在成本异常队列,不自动记 0;人工块未改动。\n\n实测自动发货与接单平台未归一收入均为 0;整体未归一 79.67% 降至 57.54%,全部来自人工块。
This commit is contained in:
yml2213
2026-10-22 18:59:53 +08:00
parent 54d2eb2f59
commit 72e1141c8a
9 changed files with 566 additions and 57 deletions
@@ -22,6 +22,7 @@ export type ActualCostSnapshotSyncResult = {
createdCount: number
upgradedCount: number
directRewardCount: number
estimatedRewardCount: number
}
/**
@@ -198,6 +199,11 @@ export async function syncActualWorkOrderCostSnapshots(
range.fromDate,
range.toDate,
)
const estimatedReward = await syncCommittedWorkOrderRewardSnapshots(
client,
range.fromDate,
range.toDate,
)
const upgraded = await client.query(
`
WITH accepted AS (
@@ -283,9 +289,10 @@ export async function syncActualWorkOrderCostSnapshots(
return {
range,
createdCount: directReward.inserted + (upgraded.rowCount || 0),
createdCount: directReward.inserted + estimatedReward.inserted + (upgraded.rowCount || 0),
upgradedCount: upgraded.rowCount || 0,
directRewardCount: directReward.inserted,
estimatedRewardCount: estimatedReward.inserted,
}
})
}
@@ -327,7 +334,7 @@ async function syncDirectWorkOrderRewardSnapshots(
JOIN orders o ON o.id = oi.order_id
WHERE wo.status = 'accepted'
AND wo.order_item_id IS NOT NULL
AND COALESCE(wo.reward_amount, 0) > 0
AND COALESCE(wo.reward_amount, 0) >= 0
AND (COALESCE(wo.accepted_at, wo.updated_at, o.paid_at, o.created_at)
AT TIME ZONE 'Asia/Shanghai')::date BETWEEN $1::date AND $2::date
ORDER BY wo.order_item_id, wo.id DESC
@@ -382,7 +389,7 @@ async function syncDirectWorkOrderRewardSnapshots(
JOIN orders o ON o.id = oi.order_id
WHERE wo.status = 'accepted'
AND wo.order_item_id IS NOT NULL
AND COALESCE(wo.reward_amount, 0) > 0
AND COALESCE(wo.reward_amount, 0) >= 0
AND (COALESCE(wo.accepted_at, wo.updated_at, o.paid_at, o.created_at)
AT TIME ZONE 'Asia/Shanghai')::date BETWEEN $1::date AND $2::date
ORDER BY wo.order_item_id, wo.id DESC
@@ -429,6 +436,138 @@ async function syncDirectWorkOrderRewardSnapshots(
}
}
/**
* 未验收工单的报酬在创建时已确定,先按 reward_amount 写 estimated 快照。
* 验收后由 syncDirectWorkOrderRewardSnapshots 升级为 actual;取消工单不计成本。
*/
async function syncCommittedWorkOrderRewardSnapshots(
client: PoolClient,
fromDate: string,
toDate: string,
) {
const superseded = await client.query(
`
WITH system_item AS (
SELECT ci.id AS cost_item_id
FROM cost_items ci
WHERE ci.code = 'sys_work_order_reward'
AND ci.status = 'active'
),
latest AS (
SELECT DISTINCT ON (wo.order_item_id)
wo.id AS work_order_id,
wo.order_item_id,
GREATEST(COALESCE(wo.reward_amount, 0), 0)::bigint AS reward_amount
FROM work_orders wo
JOIN orders o ON o.id = wo.order_id
WHERE wo.order_item_id IS NOT NULL
AND wo.status IN (
'pending_material', 'in_progress', 'unassigned', 'open',
'pending_acceptance', 'problem'
)
AND COALESCE(wo.reward_amount, 0) > 0
AND (COALESCE(o.paid_at, o.created_at) AT TIME ZONE 'Asia/Shanghai')::date
BETWEEN $1::date AND $2::date
ORDER BY wo.order_item_id, wo.id DESC
)
UPDATE cost_snapshots cs
SET superseded_at = NOW()
FROM latest l
JOIN system_item si ON TRUE
WHERE cs.subject_type = 'order_item'
AND cs.subject_id = l.order_item_id
AND cs.cost_item_id = si.cost_item_id
AND cs.superseded_at IS NULL
AND cs.snapshot_stage = 'estimated'
AND (
cs.work_order_id IS DISTINCT FROM l.work_order_id
OR cs.total_amount_fen <> l.reward_amount
)
`,
[fromDate, toDate],
)
const inserted = await client.query(
`
WITH system_item AS (
SELECT ci.id AS cost_item_id, v.id AS cost_version_id
FROM cost_items ci
JOIN LATERAL (
SELECT id
FROM cost_versions
WHERE cost_item_id = ci.id
AND status = 'active'
AND effective_from <= NOW()
ORDER BY effective_from DESC, id DESC
LIMIT 1
) v ON TRUE
WHERE ci.code = 'sys_work_order_reward'
AND ci.status = 'active'
),
latest AS (
SELECT DISTINCT ON (wo.order_item_id)
wo.id AS work_order_id,
wo.order_item_id,
wo.status,
GREATEST(COALESCE(wo.reward_amount, 0), 0)::bigint AS reward_amount,
COALESCE(wo.created_at, o.paid_at, o.created_at, NOW()) AS basis_at
FROM work_orders wo
JOIN orders o ON o.id = wo.order_id
WHERE wo.order_item_id IS NOT NULL
AND wo.status IN (
'pending_material', 'in_progress', 'unassigned', 'open',
'pending_acceptance', 'problem'
)
AND COALESCE(wo.reward_amount, 0) > 0
AND (COALESCE(o.paid_at, o.created_at) AT TIME ZONE 'Asia/Shanghai')::date
BETWEEN $1::date AND $2::date
ORDER BY wo.order_item_id, wo.id DESC
)
INSERT INTO cost_snapshots (
subject_type, subject_id, order_id, order_item_id, work_order_id,
carrier_type, cost_item_id, cost_version_id, canonical_product_id,
quantity, unit_amount_fen, total_amount_fen, snapshot_stage, source,
metadata_json, cost_basis_at, resolved_at, created_at
)
SELECT
'order_item', l.order_item_id, oi.order_id, l.order_item_id, l.work_order_id,
'work_order', si.cost_item_id, si.cost_version_id, oi.canonical_product_id,
1, l.reward_amount, l.reward_amount, 'estimated', 'resolved',
jsonb_build_object(
'source', 'work_order_reward_committed',
'workOrderStatus', l.status,
'estimatedRewardFen', l.reward_amount,
'basisAt', l.basis_at
),
l.basis_at, NOW(), NOW()
FROM latest l
CROSS JOIN system_item si
JOIN order_items oi ON oi.id = l.order_item_id
WHERE NOT EXISTS (
SELECT 1 FROM work_orders accepted
WHERE accepted.order_item_id = l.order_item_id
AND accepted.status = 'accepted'
)
AND NOT EXISTS (
SELECT 1 FROM cost_snapshots cs
WHERE cs.subject_type = 'order_item'
AND cs.subject_id = l.order_item_id
AND cs.cost_item_id = si.cost_item_id
AND cs.superseded_at IS NULL
)
ON CONFLICT (subject_type, subject_id, cost_item_id)
WHERE superseded_at IS NULL
DO NOTHING
`,
[fromDate, toDate],
)
return {
inserted: inserted.rowCount || 0,
superseded: superseded.rowCount || 0,
}
}
async function insertAndResolveProductMappingExceptions(
client: PoolClient,
fromDate: string,