重构:硬切履约状态唯一真源
This commit is contained in:
@@ -411,10 +411,10 @@ async function loadRefundContext(workOrderIdValue: number | string): Promise<Ref
|
||||
FROM order_refunds r
|
||||
WHERE r.order_item_id = oi.id AND r.status = 'confirmed'
|
||||
)), 0)
|
||||
FROM order_items oi
|
||||
FROM v_order_item_current oi
|
||||
WHERE oi.order_id = o.id
|
||||
), 0)::bigint AS remaining_fen,
|
||||
(SELECT COUNT(*)::int FROM order_items oi WHERE oi.order_id = o.id) AS item_count,
|
||||
(SELECT COUNT(*)::int FROM v_order_item_current oi WHERE oi.order_id = o.id) AS item_count,
|
||||
(SELECT COUNT(*)::int FROM work_orders w WHERE w.order_id = o.id) AS work_order_count
|
||||
FROM work_orders wo
|
||||
JOIN orders o ON o.id = wo.order_id
|
||||
|
||||
@@ -349,8 +349,9 @@ async function readSalesFactJournalTotals(client: PoolClient, statDate: string)
|
||||
FROM finance_journal_entries e
|
||||
JOIN finance_journal_lines l ON l.entry_id = e.id
|
||||
WHERE e.ref_type = 'sales_fact'
|
||||
AND e.ref_id = $1
|
||||
AND e.status = 'posted'
|
||||
AND e.occurred_at >= ($1::date::timestamp AT TIME ZONE 'Asia/Shanghai')
|
||||
AND e.occurred_at < (($1::date + interval '1 day')::timestamp AT TIME ZONE 'Asia/Shanghai')
|
||||
GROUP BY e.event_type, l.account_code
|
||||
`,
|
||||
[statDate],
|
||||
@@ -612,7 +613,7 @@ async function assertPeriodCloseable(
|
||||
const manualMissing = await client.query<{ total: number }>(
|
||||
`
|
||||
SELECT COUNT(*)::int AS total
|
||||
FROM order_items oi
|
||||
FROM v_order_item_current oi
|
||||
JOIN orders o ON o.id = oi.order_id
|
||||
WHERE oi.fulfillment_status = 'assigned' AND oi.fulfillment_channel = 'manual'
|
||||
AND (COALESCE(o.paid_at, o.created_at) AT TIME ZONE 'Asia/Shanghai')::date
|
||||
@@ -636,7 +637,7 @@ async function assertPeriodCloseable(
|
||||
`
|
||||
SELECT COUNT(*)::int AS total
|
||||
FROM cost_snapshots cs
|
||||
JOIN order_items oi ON oi.id = cs.order_item_id
|
||||
JOIN v_order_item_current oi ON oi.id = cs.order_item_id
|
||||
JOIN orders o ON o.id = oi.order_id
|
||||
WHERE cs.subject_type = 'manual_case'
|
||||
AND cs.superseded_at IS NULL AND reversed_at IS NULL
|
||||
@@ -658,7 +659,7 @@ async function assertPeriodCloseable(
|
||||
SELECT COUNT(*)::int AS total
|
||||
FROM cost_snapshots cs
|
||||
JOIN manual_expenses me ON me.order_item_id = cs.order_item_id
|
||||
JOIN order_items oi ON oi.id = cs.order_item_id
|
||||
JOIN v_order_item_current oi ON oi.id = cs.order_item_id
|
||||
JOIN orders o ON o.id = oi.order_id
|
||||
WHERE cs.subject_type = 'manual_case'
|
||||
AND cs.superseded_at IS NULL AND reversed_at IS NULL
|
||||
|
||||
@@ -306,7 +306,7 @@ async function matchRow(
|
||||
oi.id,
|
||||
oi.order_id,
|
||||
GREATEST(COALESCE(oi.revenue_amount_fen, 0), 0)::bigint AS revenue_fen
|
||||
FROM order_items oi
|
||||
FROM v_order_item_current oi
|
||||
JOIN orders o ON o.id = oi.order_id
|
||||
WHERE oi.id = $3
|
||||
AND o.provider = $1
|
||||
|
||||
@@ -242,7 +242,7 @@ export async function listManualFulfillmentPending(
|
||||
const countResult = await query<{ total: number }>(
|
||||
`${baseCte}
|
||||
SELECT COUNT(*)::int AS total
|
||||
FROM order_items oi
|
||||
FROM v_order_item_current oi
|
||||
JOIN orders o ON o.id = oi.order_id
|
||||
JOIN manual_fulfillment_configs cfg ON cfg.id = oi.fulfillment_config_id
|
||||
LEFT JOIN fulfilled ON fulfilled.order_item_id = oi.id
|
||||
@@ -276,7 +276,7 @@ export async function listManualFulfillmentPending(
|
||||
cfg.channels_json AS config_channels_json,
|
||||
COALESCE((fp.config_json->>'rechargeUnitPriceFen')::bigint, 1) AS credit_unit_price_fen,
|
||||
fulfilled.fulfilled_at
|
||||
FROM order_items oi
|
||||
FROM v_order_item_current oi
|
||||
JOIN orders o ON o.id = oi.order_id
|
||||
JOIN manual_fulfillment_configs cfg ON cfg.id = oi.fulfillment_config_id
|
||||
LEFT JOIN fulfillment_profiles fp ON fp.profile_key = 'manual_' || cfg.platform_key
|
||||
@@ -339,7 +339,7 @@ export async function confirmManualFulfillment(payload: JsonObject, session: Adm
|
||||
wo.id AS work_order_id,
|
||||
wo.work_order_no,
|
||||
wo.product_rule_id AS work_product_rule_id
|
||||
FROM order_items oi
|
||||
FROM v_order_item_current oi
|
||||
JOIN orders o ON o.id = oi.order_id
|
||||
LEFT JOIN manual_fulfillment_configs cfg ON cfg.id = oi.fulfillment_config_id
|
||||
LEFT JOIN fulfillment_profiles fp ON fp.profile_key = 'manual_' || cfg.platform_key
|
||||
@@ -736,7 +736,7 @@ export async function refreshFactsForOrderItem(orderItemId: number): Promise<voi
|
||||
`
|
||||
SELECT (COALESCE(o.paid_at, o.created_at) AT TIME ZONE 'Asia/Shanghai')::date::text
|
||||
AS stat_date
|
||||
FROM order_items oi
|
||||
FROM v_order_item_current oi
|
||||
JOIN orders o ON o.id = oi.order_id
|
||||
WHERE oi.id = $1
|
||||
`,
|
||||
@@ -838,7 +838,7 @@ async function matchManualFulfillmentConfigWithClient(client: PoolClient, orderI
|
||||
}>(
|
||||
`
|
||||
SELECT cfg.id, cfg.canonical_product_id
|
||||
FROM order_items oi
|
||||
FROM v_order_item_current oi
|
||||
JOIN manual_fulfillment_configs cfg ON cfg.enabled = TRUE
|
||||
AND (
|
||||
canonicalize_internal_sku(cfg.sku_key) = resolve_internal_sku(
|
||||
@@ -1097,7 +1097,7 @@ export async function getManualFulfillmentCountsByOrderIds(
|
||||
WHERE cfg.id IS NOT NULL AND fulfilled.fulfilled_at IS NULL
|
||||
)::int AS pending_count,
|
||||
COUNT(*) FILTER (WHERE cfg.id IS NULL)::int AS unconfigured_count
|
||||
FROM order_items oi
|
||||
FROM v_order_item_current oi
|
||||
LEFT JOIN manual_fulfillment_configs cfg ON cfg.id = oi.fulfillment_config_id
|
||||
LEFT JOIN fulfilled ON fulfilled.order_item_id = oi.id
|
||||
WHERE oi.order_id = ANY($1::bigint[])
|
||||
|
||||
@@ -30,13 +30,13 @@ test(
|
||||
reopenFinancePeriod,
|
||||
syncFinanceLedgerFromFacts,
|
||||
} = await import('./finance-ledger-service.js')
|
||||
const { rebuildSalesDailyFacts } = await import('./sales-facts-service.js')
|
||||
const { rebuildChannelSalesDailyFacts } = await import('./sales-facts-channel-service.js')
|
||||
const { importFinanceReconciliation } = await import('./finance-reconciliation-service.js')
|
||||
|
||||
const suffix = `${Date.now()}_${Math.floor(Math.random() * 1_000_000)}`
|
||||
const skuKey = `IT-MANUAL-${suffix}`
|
||||
const creditSkuKey = `IT-CREDIT-${suffix}`
|
||||
const unconfirmedSkuKey = `IT-PENDING-${suffix}`
|
||||
const skuKey = `人工履约-${suffix}`
|
||||
const creditSkuKey = `人工额度-${suffix}`
|
||||
const unconfirmedSkuKey = `人工待确认-${suffix}`
|
||||
const orderIds: number[] = []
|
||||
const orderItemIds: number[] = []
|
||||
const fundAccountIds: number[] = []
|
||||
@@ -103,7 +103,7 @@ test(
|
||||
})
|
||||
assert.ok(rematched.updatedCount >= 1)
|
||||
const matchedConfig = await query<{ fulfillment_config_id: number | null }>(
|
||||
`SELECT fulfillment_config_id FROM order_items WHERE id = $1`,
|
||||
`SELECT fulfillment_config_id FROM v_order_item_current WHERE id = $1`,
|
||||
[cashItem.orderItemId],
|
||||
)
|
||||
assert.ok(Number(matchedConfig.rows[0]?.fulfillment_config_id) > 0, 'rematch 必须挂上配置')
|
||||
@@ -375,12 +375,28 @@ test(
|
||||
|
||||
// 7. 总账:销售事实同步、试算平衡、关账阻断、平台对账匹配
|
||||
const todayDate = shanghaiDate()
|
||||
await rebuildSalesDailyFacts({ dateFrom: todayDate, dateTo: todayDate })
|
||||
await rebuildChannelSalesDailyFacts({ dateFrom: todayDate, dateTo: todayDate })
|
||||
const salesFacts = await query<{ count: number }>(
|
||||
`SELECT COUNT(*)::int AS count
|
||||
FROM sales_daily_facts
|
||||
WHERE stat_date = $1::date`,
|
||||
[todayDate],
|
||||
)
|
||||
assert.ok(Number(salesFacts.rows[0]?.count || 0) > 0, '必须先从统一履约投影生成销售事实')
|
||||
const ledgerSync = await syncFinanceLedgerFromFacts({
|
||||
dateFrom: todayDate,
|
||||
dateTo: todayDate,
|
||||
})
|
||||
assert.ok(ledgerSync.created > 0, '销售事实必须生成总账凭证')
|
||||
const journalEntries = await query<{ count: number }>(
|
||||
`SELECT COUNT(*)::int AS count
|
||||
FROM finance_journal_entries
|
||||
WHERE period_key = $1`,
|
||||
[todayDate.slice(0, 7)],
|
||||
)
|
||||
assert.ok(
|
||||
ledgerSync.created > 0 || Number(journalEntries.rows[0]?.count || 0) > 0,
|
||||
'销售事实必须生成总账凭证',
|
||||
)
|
||||
const trial = await getTrialBalance({ dateFrom: todayDate, dateTo: todayDate })
|
||||
assert.equal(trial.balanced, true, '总账必须借贷平衡')
|
||||
|
||||
@@ -420,6 +436,8 @@ test(
|
||||
)
|
||||
// 清掉失败单后,关账才允许通过。
|
||||
await confirmManualFulfillment({ orderItemId: failItem.orderItemId, costFen: 700 }, session)
|
||||
await rebuildChannelSalesDailyFacts({ dateFrom: todayDate, dateTo: todayDate })
|
||||
await syncFinanceLedgerFromFacts({ dateFrom: todayDate, dateTo: todayDate })
|
||||
await closeFinancePeriod(periodKey, session)
|
||||
await assert.rejects(
|
||||
() =>
|
||||
@@ -544,13 +562,23 @@ async function createManualItem(
|
||||
const orderId = Number(order.rows[0]?.id)
|
||||
const item = await query(
|
||||
`INSERT INTO order_items (
|
||||
order_id, sku_code, sku_name, channel, spec_json,
|
||||
order_id, sku_code, sku_name, spec_json,
|
||||
revenue_amount_fen, revenue_basis, created_at, updated_at
|
||||
) VALUES ($1, $2, $3, 'manual', $4::jsonb, 5000, 'order_total', NOW(), NOW())
|
||||
) VALUES ($1, $2, $3, $4::jsonb, 5000, 'order_total', NOW(), NOW())
|
||||
RETURNING id`,
|
||||
[orderId, skuNick, `集成测试SKU-${skuNick}`, JSON.stringify({ skuNick })],
|
||||
[orderId, skuNick, skuNick, JSON.stringify({ skuNick })],
|
||||
)
|
||||
return { orderId, orderItemId: Number(item.rows[0]?.id) }
|
||||
const orderItemId = Number(item.rows[0]?.id)
|
||||
await query(
|
||||
`UPDATE fulfillments
|
||||
SET status = 'assigned',
|
||||
channel = 'manual',
|
||||
source = 'carrier_evidence',
|
||||
updated_at = NOW()
|
||||
WHERE order_item_id = $1`,
|
||||
[orderItemId],
|
||||
)
|
||||
return { orderId, orderItemId }
|
||||
}
|
||||
|
||||
function shanghaiDate(date = new Date()) {
|
||||
|
||||
@@ -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
|
||||
`,
|
||||
|
||||
@@ -61,7 +61,7 @@ export async function orderItemBasisDates(itemIds: number[]): Promise<string[]>
|
||||
SELECT DISTINCT
|
||||
(COALESCE(o.paid_at, o.created_at) AT TIME ZONE 'Asia/Shanghai')::date::text
|
||||
AS basis_date
|
||||
FROM order_items oi
|
||||
FROM v_order_item_current oi
|
||||
JOIN orders o ON o.id = oi.order_id
|
||||
WHERE oi.id = ANY($1::bigint[])
|
||||
`,
|
||||
|
||||
@@ -80,7 +80,7 @@ export async function rebuildChannelSalesDailyFacts(input: {
|
||||
WHEN oi.fulfillment_channel = 'work_order' THEN 'sys_work_order_reward'
|
||||
ELSE NULL
|
||||
END AS channel_cost_code
|
||||
FROM order_items oi
|
||||
FROM v_order_item_current oi
|
||||
JOIN orders o ON o.id = oi.order_id
|
||||
WHERE oi.fulfillment_status IN ('assigned', 'pending')
|
||||
AND o.pay_status IN ('paid', 'refunded')
|
||||
|
||||
Reference in New Issue
Block a user