Merge branch 'main' into dev
This commit is contained in:
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,51 @@
|
||||
-- 149_finance_derived_scope.sql
|
||||
--
|
||||
-- 财务销售范围唯一读模型:
|
||||
-- v_finance_order_item_scope 统一收入、退款、商品、渠道和业务日,
|
||||
-- 销售事实、重建与审计共用这一口径。
|
||||
--
|
||||
-- 合并自未上生产的 167。
|
||||
-- 财务派生范围唯一读模型:
|
||||
-- 1. 只纳入 pending / assigned 履约项;
|
||||
-- 2. 只纳入 paid / refunded 商业订单;
|
||||
-- 3. 收入、退款、商品、渠道和业务日一次算清;
|
||||
-- 4. 销售事实、重建和审计共用该视图,禁止各自拼口径。
|
||||
|
||||
CREATE OR REPLACE VIEW v_finance_order_item_scope AS
|
||||
WITH refunded AS (
|
||||
SELECT
|
||||
refund.order_item_id,
|
||||
SUM(refund.amount_fen)::bigint AS refund_fen
|
||||
FROM order_refunds refund
|
||||
WHERE refund.status = 'confirmed'
|
||||
GROUP BY refund.order_item_id
|
||||
)
|
||||
SELECT
|
||||
item.id AS order_item_id,
|
||||
item.order_id,
|
||||
(COALESCE(order_record.paid_at, order_record.created_at)
|
||||
AT TIME ZONE 'Asia/Shanghai')::date AS stat_date,
|
||||
COALESCE(order_record.paid_at, order_record.created_at) AS basis_at,
|
||||
order_record.provider,
|
||||
order_record.shop_id,
|
||||
fulfillment.canonical_product_id,
|
||||
CASE
|
||||
WHEN fulfillment.status = 'pending' OR fulfillment.channel IS NULL THEN 'unclassified'
|
||||
ELSE fulfillment.channel
|
||||
END AS channel,
|
||||
GREATEST(COALESCE(item.normalized_quantity, item.quantity, 1), 1)::numeric AS quantity,
|
||||
GREATEST(COALESCE(item.revenue_amount_fen, 0), 0)::bigint AS revenue_fen,
|
||||
GREATEST(COALESCE(refunded.refund_fen, 0), 0)::bigint AS refund_fen
|
||||
FROM fulfillments fulfillment
|
||||
JOIN order_items item ON item.id = fulfillment.order_item_id
|
||||
JOIN orders order_record ON order_record.id = fulfillment.order_id
|
||||
LEFT JOIN refunded ON refunded.order_item_id = item.id
|
||||
WHERE fulfillment.status IN ('pending', 'assigned')
|
||||
AND order_record.pay_status IN ('paid', 'refunded');
|
||||
|
||||
COMMENT ON VIEW v_finance_order_item_scope IS
|
||||
'财务销售范围唯一读模型:收入、退款、商品、渠道和业务日统一从履约真源与商业订单计算';
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_finance_entries_sales_fact_day
|
||||
ON finance_journal_entries (occurred_at)
|
||||
WHERE ref_type = 'sales_fact';
|
||||
@@ -0,0 +1,24 @@
|
||||
-- 150_voucher_consume_order_received_scope.sql
|
||||
--
|
||||
-- “收到订单后”核销改为订单级触发:
|
||||
-- 1. 不再依赖履约渠道、订单项状态或待处理原因;
|
||||
-- 2. 订单级任务以 order:<订单ID> 去重;
|
||||
-- 3. channel=order_received 仅用于任务来源审计和后台筛选。
|
||||
|
||||
ALTER TABLE voucher_consume_jobs
|
||||
DROP CONSTRAINT IF EXISTS voucher_consume_jobs_channel_check;
|
||||
|
||||
ALTER TABLE voucher_consume_jobs
|
||||
ADD CONSTRAINT voucher_consume_jobs_channel_check
|
||||
CHECK (channel IN (
|
||||
'order_received',
|
||||
'affiliate_dash',
|
||||
'work_order',
|
||||
'manual',
|
||||
'third_party_voucher',
|
||||
'on_account',
|
||||
'unmatched'
|
||||
));
|
||||
|
||||
COMMENT ON COLUMN voucher_consume_jobs.channel IS
|
||||
'触发核销时的策略来源;order_received 表示与履约渠道无关的订单级收单触发';
|
||||
@@ -0,0 +1,25 @@
|
||||
-- 151_sales_daily_facts_on_account_channel.sql
|
||||
--
|
||||
-- 财务销售事实渠道枚举补齐统一结算渠道。
|
||||
-- v_finance_order_item_scope 会原样输出 fulfillments.channel,而履约真源自
|
||||
-- 132_on_account_and_manual_channels.sql 起已合法包含 on_account。
|
||||
|
||||
ALTER TABLE sales_daily_facts
|
||||
DROP CONSTRAINT IF EXISTS chk_sales_daily_facts_fulfillment_mode;
|
||||
|
||||
ALTER TABLE sales_daily_facts
|
||||
ADD CONSTRAINT chk_sales_daily_facts_fulfillment_mode
|
||||
CHECK (
|
||||
channel IN (
|
||||
'work_order',
|
||||
'affiliate_dash',
|
||||
'third_party_voucher',
|
||||
'manual',
|
||||
'on_account',
|
||||
'unclassified',
|
||||
'archived'
|
||||
)
|
||||
);
|
||||
|
||||
COMMENT ON COLUMN sales_daily_facts.channel IS
|
||||
'销售事实维度(渠道):work_order / affiliate_dash / third_party_voucher / manual / on_account / unclassified 未分类 / archived 归档';
|
||||
Reference in New Issue
Block a user