feat(fulfillment): 增加统一结算与多渠道人工履约
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
-- Persistent delayed voucher consumption jobs.
|
||||
-- 延迟核销任务。
|
||||
--
|
||||
-- Business events only enqueue a job. A scheduler worker performs the external
|
||||
-- platform call later, so a restart cannot lose a delayed consumption.
|
||||
-- 业务事件只负责投递任务,真正的外部平台核销由定时任务稍后执行;
|
||||
-- 任务持久化到数据库,服务重启也不会丢失延迟核销。
|
||||
|
||||
CREATE TABLE IF NOT EXISTS voucher_consume_jobs (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
@@ -29,8 +29,8 @@ CREATE TABLE IF NOT EXISTS voucher_consume_jobs (
|
||||
finished_at TIMESTAMPTZ
|
||||
);
|
||||
|
||||
-- Keep one active/successful target per provider. Failed jobs may be replaced
|
||||
-- by a later business event, while succeeded jobs suppress duplicate events.
|
||||
-- 同一平台、同一个核销目标只保留一个活跃或已成功任务。
|
||||
-- 失败任务允许后续业务事件重新投递;成功任务阻止重复投递。
|
||||
CREATE UNIQUE INDEX IF NOT EXISTS uq_voucher_consume_jobs_active_target
|
||||
ON voucher_consume_jobs(provider, target_key)
|
||||
WHERE status IN ('pending', 'processing', 'succeeded');
|
||||
@@ -45,6 +45,6 @@ CREATE INDEX IF NOT EXISTS idx_voucher_consume_jobs_updated
|
||||
ON voucher_consume_jobs(updated_at DESC, id DESC);
|
||||
|
||||
COMMENT ON TABLE voucher_consume_jobs IS
|
||||
'Delayed voucher verification jobs; events enqueue, scheduler executes';
|
||||
'延迟核销任务:业务事件负责投递,定时任务负责执行';
|
||||
COMMENT ON COLUMN voucher_consume_jobs.target_key IS
|
||||
'Stable dedupe target: order-item when available, otherwise task/order';
|
||||
'稳定去重目标:优先订单项,没有订单项时使用任务或订单';
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
-- 允许待履约订单项保留已经选择的履约渠道。
|
||||
--
|
||||
-- pending + 渠道:渠道已确定,但载体、商品或成本配置尚未完成;
|
||||
-- assigned:真实履约载体已经创建完成。
|
||||
|
||||
ALTER TABLE order_items
|
||||
DROP CONSTRAINT IF EXISTS chk_order_items_fulfillment_channel_status;
|
||||
|
||||
ALTER TABLE order_items
|
||||
ADD CONSTRAINT chk_order_items_fulfillment_channel_status
|
||||
CHECK (
|
||||
fulfillment_status = 'pending'
|
||||
OR (fulfillment_status = 'assigned' AND fulfillment_channel IS NOT NULL)
|
||||
OR fulfillment_status = 'archived'
|
||||
);
|
||||
|
||||
COMMENT ON CONSTRAINT chk_order_items_fulfillment_channel_status ON order_items IS
|
||||
'pending 允许保留已选择渠道并等待配置完成;assigned 必须存在履约渠道';
|
||||
@@ -0,0 +1,93 @@
|
||||
-- 132_on_account_and_manual_channels.sql
|
||||
--
|
||||
-- 新增“统一结算”履约渠道,并支持一个内部 SKU 配置多个人工履约渠道。
|
||||
-- 客服确认履约时选择本次实际渠道;统一结算只生成虚拟账单,不扣积分或备用金。
|
||||
|
||||
-- 1. 订单项履约渠道增加 on_account。
|
||||
ALTER TABLE order_items
|
||||
DROP CONSTRAINT IF EXISTS chk_order_items_fulfillment_channel;
|
||||
|
||||
ALTER TABLE order_items
|
||||
ADD CONSTRAINT chk_order_items_fulfillment_channel
|
||||
CHECK (
|
||||
fulfillment_channel IS NULL
|
||||
OR fulfillment_channel IN (
|
||||
'work_order', 'affiliate_dash', 'third_party_voucher', 'manual', 'on_account'
|
||||
)
|
||||
);
|
||||
|
||||
-- 2. 内部 SKU 渠道配置增加 on_account。
|
||||
ALTER TABLE internal_sku_channels
|
||||
DROP CONSTRAINT IF EXISTS internal_sku_channels_channel_check;
|
||||
|
||||
ALTER TABLE internal_sku_channels
|
||||
ADD CONSTRAINT internal_sku_channels_channel_check
|
||||
CHECK (channel IN ('work_order', 'affiliate_dash', 'third_party_voucher', 'manual', 'on_account'));
|
||||
|
||||
-- 3. 自动核销任务允许记录 on_account 渠道。
|
||||
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 ('affiliate_dash', 'work_order', 'manual', 'third_party_voucher', 'on_account'));
|
||||
|
||||
-- 4. 人工 SKU 配置支持多个渠道明细,旧单渠道字段继续保留用于兼容。
|
||||
ALTER TABLE manual_fulfillment_configs
|
||||
ADD COLUMN IF NOT EXISTS channels_json JSONB NOT NULL DEFAULT '[]'::jsonb;
|
||||
|
||||
ALTER TABLE manual_fulfillment_configs
|
||||
DROP CONSTRAINT IF EXISTS chk_manual_fulfillment_configs_platform;
|
||||
|
||||
ALTER TABLE manual_fulfillment_configs
|
||||
ADD CONSTRAINT chk_manual_fulfillment_configs_platform
|
||||
CHECK (platform_key IN ('nanhang', 'lewan', 'rock', 'fund_cash', 'on_account'));
|
||||
|
||||
UPDATE manual_fulfillment_configs
|
||||
SET channels_json = jsonb_build_array(
|
||||
jsonb_build_object(
|
||||
'platformKey', platform_key,
|
||||
'creditQuantity', credit_quantity,
|
||||
'costMode', cost_mode,
|
||||
'enabled', enabled
|
||||
)
|
||||
)
|
||||
WHERE channels_json = '[]'::jsonb;
|
||||
|
||||
COMMENT ON COLUMN manual_fulfillment_configs.channels_json IS
|
||||
'人工履约渠道明细:platformKey / creditQuantity / costMode / enabled;旧 platform_key 字段保留兼容';
|
||||
|
||||
-- 5. 统一结算虚拟账单。后续统一对账以该表为待办真源。
|
||||
CREATE TABLE IF NOT EXISTS on_account_bills (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
bill_no TEXT NOT NULL UNIQUE,
|
||||
order_id BIGINT NOT NULL REFERENCES orders(id) ON DELETE CASCADE,
|
||||
order_item_id BIGINT NOT NULL REFERENCES order_items(id) ON DELETE CASCADE,
|
||||
sku_key TEXT NOT NULL DEFAULT '',
|
||||
canonical_product_id BIGINT REFERENCES product_catalog(id) ON DELETE SET NULL,
|
||||
platform_order_id TEXT NOT NULL DEFAULT '',
|
||||
amount_fen BIGINT NOT NULL CHECK (amount_fen >= 0),
|
||||
status TEXT NOT NULL DEFAULT 'pending'
|
||||
CHECK (status IN ('pending', 'reconciled', 'void')),
|
||||
payee_name TEXT NOT NULL DEFAULT '',
|
||||
note TEXT NOT NULL DEFAULT '',
|
||||
metadata_json JSONB NOT NULL DEFAULT '{}'::jsonb,
|
||||
created_by_admin_user_id BIGINT REFERENCES admin_users(id) ON DELETE SET NULL,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
reconciled_at TIMESTAMPTZ
|
||||
);
|
||||
|
||||
CREATE UNIQUE INDEX IF NOT EXISTS uq_on_account_bills_order_item
|
||||
ON on_account_bills(order_item_id);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_on_account_bills_status_created
|
||||
ON on_account_bills(status, created_at DESC, id DESC);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_on_account_bills_order
|
||||
ON on_account_bills(order_id, order_item_id);
|
||||
|
||||
COMMENT ON TABLE on_account_bills IS
|
||||
'统一结算虚拟账单:确认履约时生成,不扣客服积分或备用金,后续统一对账';
|
||||
COMMENT ON COLUMN on_account_bills.status IS
|
||||
'pending 待对账 / reconciled 已对账 / void 已作废';
|
||||
@@ -0,0 +1,21 @@
|
||||
-- 133_manual_credit_quantity_decimal.sql
|
||||
--
|
||||
-- 人工履约的现金金额支持最多 2 位小数;积分渠道仍只接受整数。
|
||||
-- 成本金额仍按整数分保存,避免把金额精度扩散到财务快照和总账。
|
||||
|
||||
ALTER TABLE manual_fulfillment_configs
|
||||
ALTER COLUMN credit_quantity TYPE NUMERIC(18, 2)
|
||||
USING ROUND(credit_quantity::numeric, 2);
|
||||
|
||||
COMMENT ON COLUMN manual_fulfillment_configs.credit_quantity IS
|
||||
'每单消耗量;积分渠道必须为整数,备用金现金/统一结算为元且最多 2 位小数;0 表示成本不固定';
|
||||
|
||||
ALTER TABLE manual_fulfillment_configs
|
||||
DROP CONSTRAINT IF EXISTS chk_manual_fulfillment_configs_integer_credit;
|
||||
|
||||
ALTER TABLE manual_fulfillment_configs
|
||||
ADD CONSTRAINT chk_manual_fulfillment_configs_integer_credit
|
||||
CHECK (
|
||||
platform_key IN ('fund_cash', 'on_account')
|
||||
OR credit_quantity = TRUNC(credit_quantity)
|
||||
);
|
||||
Reference in New Issue
Block a user