Merge branch 'main' into dev_match

This commit is contained in:
2026-11-06 17:39:08 +08:00
59 changed files with 3319 additions and 956 deletions
@@ -0,0 +1,82 @@
-- 核销任务直接保存目标券码,供后台“最近核销任务”展示和检索。
-- 任务创建时会先解析候选券码;执行时再刷新一次,兼容券码晚于任务到达的场景。
CREATE EXTENSION IF NOT EXISTS pg_trgm;
ALTER TABLE voucher_consume_jobs
ADD COLUMN IF NOT EXISTS voucher_codes TEXT[] NOT NULL DEFAULT ARRAY[]::TEXT[];
COMMENT ON COLUMN voucher_consume_jobs.voucher_codes IS
'核销任务关联的券码;快手电子凭证保存 voucher_code,抖音码速达保存我方与平台侧券码';
-- array_to_string 在 PostgreSQL 中被标记为 STABLE,不能直接用于表达式索引;
-- text[] 的拼接是本项目的确定性展示口径,用 IMMUTABLE 包装支持核销码模糊检索。
CREATE OR REPLACE FUNCTION fulfillment_voucher_codes_search_text(codes TEXT[])
RETURNS TEXT
LANGUAGE sql
IMMUTABLE
PARALLEL SAFE
RETURN ARRAY_TO_STRING(codes, ' ');
COMMENT ON FUNCTION fulfillment_voucher_codes_search_text(TEXT[]) IS
'核销任务券码模糊搜索文本(用于 GIN trigram 表达式索引)';
CREATE INDEX IF NOT EXISTS idx_voucher_consume_jobs_voucher_codes
ON voucher_consume_jobs
USING GIN ((fulfillment_voucher_codes_search_text(voucher_codes)) gin_trgm_ops);
-- 回填已有任务。快手优先按任务/单元定位;没有任务时退回订单号维度。
UPDATE voucher_consume_jobs job
SET voucher_codes = COALESCE((
SELECT ARRAY_AGG(DISTINCT voucher.voucher_code ORDER BY voucher.voucher_code)
FROM kuaishou_industry_vouchers voucher
WHERE job.provider = 'kuaishou_industry'
AND voucher.oid = job.platform_order_id
AND BTRIM(voucher.voucher_code) <> ''
AND (
job.task_id IS NULL
OR voucher.task_id = job.task_id
OR voucher.unit_index = (
SELECT task.unit_index FROM fulfillment_tasks task WHERE task.id = job.task_id
)
)
), ARRAY[]::TEXT[])
WHERE job.provider = 'kuaishou_industry'
AND CARDINALITY(job.voucher_codes) = 0;
-- 抖音码速达可能发生平台侧换码,因此两个券码都保留并可搜索。
UPDATE voucher_consume_jobs job
SET voucher_codes = COALESCE((
SELECT ARRAY_AGG(DISTINCT code ORDER BY code)
FROM (
SELECT certificate.cert_no AS code
FROM redeem_certificates certificate
WHERE certificate.provider = 'douyin_mashida'
AND (
certificate.local_order_id = job.order_id
OR (job.order_id IS NULL AND certificate.order_id = job.platform_order_id)
)
AND BTRIM(certificate.cert_no) <> ''
AND (
job.order_item_id IS NULL
OR certificate.order_item_id IS NULL
OR certificate.order_item_id = job.order_item_id
)
UNION
SELECT certificate.platform_cert_no AS code
FROM redeem_certificates certificate
WHERE certificate.provider = 'douyin_mashida'
AND (
certificate.local_order_id = job.order_id
OR (job.order_id IS NULL AND certificate.order_id = job.platform_order_id)
)
AND BTRIM(certificate.platform_cert_no) <> ''
AND (
job.order_item_id IS NULL
OR certificate.order_item_id IS NULL
OR certificate.order_item_id = job.order_item_id
)
) codes
), ARRAY[]::TEXT[])
WHERE job.provider = 'douyin_mashida'
AND CARDINALITY(job.voucher_codes) = 0;
@@ -0,0 +1,173 @@
-- 143_repair_third_party_voucher_products.sql
--
-- 第三方卡券订单项必须关联 tpv:<内部 SKU>。历史商品归一在缺少 tpv 商品时
-- 会回退到同名 man 商品,导致卡券订单使用人工商品维度而无法生成卡券采购成本。
-- 本迁移只修正商品归属、渠道规则和能力,不删除任何商品、订单或历史快照。
-- 部署后由 cost_snapshot / sales_facts 管道补建成本快照并重算受影响日期。
DROP TABLE IF EXISTS pg_temp.tmp_repair_voucher_items;
CREATE TEMP TABLE tmp_repair_voucher_items ON COMMIT DROP AS
SELECT
oi.id AS order_item_id,
oi.order_id,
resolve_internal_sku(oi.manual_sku_key, oi.sku_name, oi.sku_code) AS internal_sku,
(COALESCE(o.paid_at, o.created_at) AT TIME ZONE 'Asia/Shanghai')::date::text AS basis_date
FROM order_items oi
JOIN orders o ON o.id = oi.order_id
LEFT JOIN product_catalog current_product ON current_product.id = oi.canonical_product_id
WHERE oi.fulfillment_channel = 'third_party_voucher'
AND BTRIM(resolve_internal_sku(oi.manual_sku_key, oi.sku_name, oi.sku_code)) <> ''
AND char_length(
'tpv:' || resolve_internal_sku(oi.manual_sku_key, oi.sku_name, oi.sku_code)
) <= 64
AND (
current_product.id IS NULL
OR current_product.canonical_sku IS DISTINCT FROM
'tpv:' || resolve_internal_sku(oi.manual_sku_key, oi.sku_name, oi.sku_code)
);
CREATE UNIQUE INDEX ON tmp_repair_voucher_items (order_item_id);
INSERT INTO product_catalog (
canonical_sku, canonical_name, category, unit_name, status,
attributes_json, created_at, updated_at
)
SELECT DISTINCT
'tpv:' || item.internal_sku,
item.internal_sku,
'卡券',
'张',
'active',
'{"source":"third_party_voucher","auto_created":true,"repaired":true}'::jsonb,
NOW(),
NOW()
FROM tmp_repair_voucher_items item
ON CONFLICT (canonical_sku) DO UPDATE SET
status = 'active',
canonical_name = CASE
WHEN BTRIM(product_catalog.canonical_name) = '' THEN EXCLUDED.canonical_name
ELSE product_catalog.canonical_name
END,
attributes_json = product_catalog.attributes_json || EXCLUDED.attributes_json,
updated_at = EXCLUDED.updated_at;
UPDATE order_items oi
SET canonical_product_id = product.id,
updated_at = NOW()
FROM tmp_repair_voucher_items item
JOIN product_catalog product
ON product.canonical_sku = 'tpv:' || item.internal_sku
AND product.status = 'active'
WHERE oi.id = item.order_item_id;
UPDATE cost_snapshots snapshot
SET canonical_product_id = product.id
FROM tmp_repair_voucher_items item
JOIN product_catalog product
ON product.canonical_sku = 'tpv:' || item.internal_sku
WHERE snapshot.order_item_id = item.order_item_id
AND snapshot.superseded_at IS NULL
AND snapshot.reversed_at IS NULL;
INSERT INTO product_channel_capabilities (
product_id, channel, priority, is_fallback, enabled, source, created_at, updated_at
)
SELECT DISTINCT
product.id,
'third_party_voucher',
10,
FALSE,
TRUE,
'voucher',
NOW(),
NOW()
FROM tmp_repair_voucher_items item
JOIN product_catalog product
ON product.canonical_sku = 'tpv:' || item.internal_sku
ON CONFLICT (product_id, channel) DO UPDATE SET
priority = 10,
is_fallback = FALSE,
enabled = TRUE,
source = 'voucher',
updated_at = EXCLUDED.updated_at;
-- 卡券没有外部履约载体,规则命中即完成渠道判定;同 SKU 其他能力保留为兜底。
UPDATE internal_sku_channels channel
SET is_fallback = TRUE,
priority = GREATEST(channel.priority, 90),
updated_at = NOW()
FROM (
SELECT DISTINCT internal_sku
FROM tmp_repair_voucher_items
) repaired
WHERE canonicalize_internal_sku(channel.internal_sku) = repaired.internal_sku
AND channel.channel <> 'third_party_voucher'
AND channel.enabled = TRUE
AND channel.is_fallback = FALSE;
INSERT INTO internal_sku_channels (
internal_sku, channel, priority, is_fallback, enabled,
canonical_product_id, config_json, source, created_at, updated_at
)
SELECT DISTINCT
item.internal_sku,
'third_party_voucher',
10,
FALSE,
TRUE,
product.id,
jsonb_build_object('voucherSku', item.internal_sku, 'repaired', TRUE),
'voucher',
NOW(),
NOW()
FROM tmp_repair_voucher_items item
JOIN product_catalog product
ON product.canonical_sku = 'tpv:' || item.internal_sku
ON CONFLICT (internal_sku, channel) DO UPDATE SET
priority = 10,
is_fallback = FALSE,
enabled = TRUE,
canonical_product_id = EXCLUDED.canonical_product_id,
config_json = internal_sku_channels.config_json || EXCLUDED.config_json,
source = EXCLUDED.source,
updated_at = EXCLUDED.updated_at;
-- 修复商品归属后,商品缺失和旧成本缺失异常由 cost_snapshot 管道重新计算并自动收口。
WITH removed_links AS (
DELETE FROM cost_exception_items
WHERE order_item_id IN (
SELECT order_item_id FROM tmp_repair_voucher_items
)
RETURNING exception_id
),
affected_heads AS (
SELECT DISTINCT exception_id FROM removed_links
)
UPDATE cost_exceptions exception
SET status = 'resolved',
resolved_at = NOW(),
item_count = 0,
last_seen_at = NOW()
WHERE exception.id IN (SELECT exception_id FROM affected_heads)
AND NOT EXISTS (
SELECT 1
FROM cost_exception_items item
WHERE item.exception_id = exception.id
);
UPDATE cost_exceptions exception
SET status = 'resolved',
resolved_at = NOW(),
item_count = 0,
last_seen_at = NOW()
WHERE exception.order_item_id IN (
SELECT order_item_id FROM tmp_repair_voucher_items
)
AND NOT EXISTS (
SELECT 1
FROM cost_exception_items item
WHERE item.exception_id = exception.id
);
COMMENT ON COLUMN product_catalog.attributes_json IS
'标准商品扩展信息;第三方卡券修复记录 repaired=true,商品归属以 tpv:<内部 SKU> 为唯一口径';
@@ -0,0 +1,120 @@
-- 144_fulfillment_shadow_configuration_sync.sql
--
-- 统一履约视图会读取人工配置和 internal_sku_channels 的派生状态。
-- 这两张配置表变化时也必须刷新影子模型,否则影子表会保留旧载体状态和旧异常。
CREATE OR REPLACE FUNCTION sync_fulfillment_shadow_for_manual_config()
RETURNS TRIGGER
LANGUAGE plpgsql
AS $$
DECLARE
old_key TEXT;
new_key TEXT;
BEGIN
IF TG_OP <> 'INSERT' THEN
old_key := canonicalize_internal_sku(OLD.sku_key);
END IF;
IF TG_OP <> 'DELETE' THEN
new_key := canonicalize_internal_sku(NEW.sku_key);
END IF;
PERFORM sync_fulfillment_shadow(item.id)
FROM order_items item
WHERE item.fulfillment_status IN ('pending', 'assigned')
AND canonicalize_internal_sku(
resolve_internal_sku(item.manual_sku_key, item.sku_name, item.sku_code)
) IN (old_key, new_key);
RETURN COALESCE(NEW, OLD);
END;
$$;
DROP TRIGGER IF EXISTS trg_manual_fulfillment_config_shadow ON manual_fulfillment_configs;
CREATE TRIGGER trg_manual_fulfillment_config_shadow
AFTER INSERT OR UPDATE OR DELETE ON manual_fulfillment_configs
FOR EACH ROW
EXECUTE FUNCTION sync_fulfillment_shadow_for_manual_config();
CREATE OR REPLACE FUNCTION sync_fulfillment_shadow_for_internal_channel()
RETURNS TRIGGER
LANGUAGE plpgsql
AS $$
DECLARE
old_key TEXT;
new_key TEXT;
BEGIN
IF TG_OP <> 'INSERT' THEN
old_key := canonicalize_internal_sku(OLD.internal_sku);
END IF;
IF TG_OP <> 'DELETE' THEN
new_key := canonicalize_internal_sku(NEW.internal_sku);
END IF;
PERFORM sync_fulfillment_shadow(item.id)
FROM order_items item
WHERE item.fulfillment_status IN ('pending', 'assigned')
AND canonicalize_internal_sku(
resolve_internal_sku(item.manual_sku_key, item.sku_name, item.sku_code)
) IN (old_key, new_key);
RETURN COALESCE(NEW, OLD);
END;
$$;
DROP TRIGGER IF EXISTS trg_internal_sku_channel_shadow ON internal_sku_channels;
CREATE TRIGGER trg_internal_sku_channel_shadow
AFTER INSERT OR UPDATE OR DELETE ON internal_sku_channels
FOR EACH ROW
EXECUTE FUNCTION sync_fulfillment_shadow_for_internal_channel();
CREATE OR REPLACE FUNCTION assert_manual_config_product_source()
RETURNS TRIGGER
LANGUAGE plpgsql
AS $$
BEGIN
IF NEW.canonical_product_id IS NOT NULL
AND NOT EXISTS (
SELECT 1
FROM product_catalog product
WHERE product.id = NEW.canonical_product_id
AND product.status = 'active'
AND product.canonical_sku LIKE 'man:%'
)
THEN
RAISE EXCEPTION
'manual fulfillment config product % must be an active man: product',
NEW.canonical_product_id
USING ERRCODE = '23514';
END IF;
RETURN NEW;
END;
$$;
DROP TRIGGER IF EXISTS trg_manual_config_product_source ON manual_fulfillment_configs;
CREATE TRIGGER trg_manual_config_product_source
BEFORE INSERT OR UPDATE ON manual_fulfillment_configs
FOR EACH ROW
EXECUTE FUNCTION assert_manual_config_product_source();
-- 已启用的配置仍可能指向后来被归档的人工商品。这里恢复其 man: 商品,
-- 避免迁移后归一继续把后续订单挂到不可用商品上。
UPDATE product_catalog product
SET status = 'active',
updated_at = NOW()
FROM manual_fulfillment_configs config
WHERE config.canonical_product_id = product.id
AND config.enabled = TRUE
AND product.canonical_sku LIKE 'man:%'
AND product.status <> 'active';
-- 修正迁移 141 后由配置变化造成的存量陈旧影子记录。
SELECT sync_fulfillment_shadow(item.id)
FROM order_items item
WHERE item.fulfillment_status IN ('pending', 'assigned');
COMMENT ON FUNCTION sync_fulfillment_shadow_for_manual_config() IS
'人工配置变更后重算同内部 SKU 的履约影子';
COMMENT ON FUNCTION sync_fulfillment_shadow_for_internal_channel() IS
'统一渠道规则变更后重算同内部 SKU 的履约影子';
COMMENT ON FUNCTION assert_manual_config_product_source() IS
'人工履约配置只能关联有效的 man: 标准商品';
@@ -0,0 +1,38 @@
-- 145_fulfillment_current_attempt_latest.sql
--
-- 统一读模型按 task.id DESC 取当前尝试。为保持与 is_current 指针一致,
-- 从现在开始禁止把较旧任务重新标记为 current;新尝试仍由业务先退休旧指针。
CREATE OR REPLACE FUNCTION assert_fulfillment_current_is_latest()
RETURNS TRIGGER
LANGUAGE plpgsql
AS $$
BEGIN
IF NEW.is_current = TRUE
AND EXISTS (
SELECT 1
FROM fulfillment_tasks newer
WHERE newer.order_item_id = NEW.order_item_id
AND newer.unit_index = NEW.unit_index
AND newer.id > COALESCE(NEW.id, 0)
)
THEN
RAISE EXCEPTION
'fulfillment current attempt must be the latest attempt for order_item % unit %',
NEW.order_item_id,
NEW.unit_index
USING ERRCODE = '23514';
END IF;
RETURN NEW;
END;
$$;
DROP TRIGGER IF EXISTS trg_fulfillment_current_is_latest ON fulfillment_tasks;
CREATE TRIGGER trg_fulfillment_current_is_latest
BEFORE INSERT OR UPDATE OF is_current, order_item_id, unit_index
ON fulfillment_tasks
FOR EACH ROW
EXECUTE FUNCTION assert_fulfillment_current_is_latest();
COMMENT ON FUNCTION assert_fulfillment_current_is_latest() IS
'当前履约尝试必须是同订单项单元中 id 最大的尝试,保证统一视图 id DESC 与 is_current 一致';