merge: 合并 main 到 dev(含订单来源快照与寄售改名同步)
# Conflicts: # README.md # apps/backend/src/db/migrate.ts
This commit is contained in:
@@ -64,13 +64,6 @@ export async function runDatabaseMigrations() {
|
||||
|
||||
console.info(`[db:migrate] 迁移目录: ${MIGRATIONS_DIR}`)
|
||||
|
||||
// 分支联调库可能已应用过 main 的 147-158,而本分支的寄卖迁移编号是 147-152;
|
||||
// node-pg-migrate 的 checkOrder 会按名称逐位比较并直接抛错,导致服务起不来。
|
||||
// 生产保持严格顺序;开发/测试允许顺序放宽(迁移文件本身仍需幂等)。
|
||||
const strictMigrationOrder =
|
||||
String(process.env.DB_MIGRATION_STRICT_ORDER || '').trim() === '1' ||
|
||||
String(process.env.NODE_ENV || '').trim() === 'production'
|
||||
|
||||
await runner({
|
||||
databaseUrl: createMigrationDatabaseConfig(),
|
||||
dir: MIGRATIONS_DIR,
|
||||
@@ -79,7 +72,11 @@ export async function runDatabaseMigrations() {
|
||||
migrationsSchema: 'public',
|
||||
schema: 'public',
|
||||
singleTransaction: true,
|
||||
checkOrder: strictMigrationOrder,
|
||||
// 联调/生产库可能存在「已应用、但当前分支已删除」的历史迁移记录
|
||||
// (如 153-155 semi_auto_*)。node-pg-migrate 的严格顺序检查会把这类
|
||||
// 残留记录判成乱序并直接拒绝启动;本地迁移文件本身只增不改,
|
||||
// 这里关闭顺序检查,仍会按文件名顺序执行所有未应用迁移。
|
||||
checkOrder: false,
|
||||
logger: {
|
||||
debug: () => undefined,
|
||||
info: (message) => {
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
-- 152_order_source_facts_immutable.sql
|
||||
--
|
||||
-- 永久保留平台订单事实:
|
||||
-- 1. 每次来源同步追加完整订单快照,供审计和后续重放;
|
||||
-- 2. 快照只允许插入,不允许应用更新或删除;
|
||||
-- 3. orders.raw_payload_json 由应用写入口保证首次写入后不再覆盖。
|
||||
|
||||
CREATE TABLE IF NOT EXISTS order_source_snapshots (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
order_id BIGINT NOT NULL REFERENCES orders(id) ON DELETE RESTRICT,
|
||||
provider TEXT NOT NULL,
|
||||
platform TEXT NOT NULL,
|
||||
shop_id TEXT NOT NULL DEFAULT '',
|
||||
platform_order_id TEXT NOT NULL,
|
||||
source_label TEXT NOT NULL DEFAULT '',
|
||||
payload_json JSONB NOT NULL,
|
||||
payload_sha256 TEXT NOT NULL,
|
||||
recorded_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
|
||||
CONSTRAINT chk_order_source_snapshots_payload_sha256
|
||||
CHECK (payload_sha256 ~ '^[0-9a-f]{64}$'),
|
||||
CONSTRAINT uq_order_source_snapshots_payload
|
||||
UNIQUE (order_id, payload_sha256)
|
||||
);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_order_source_snapshots_order
|
||||
ON order_source_snapshots(order_id, recorded_at DESC, id DESC);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_order_source_snapshots_platform_order
|
||||
ON order_source_snapshots(provider, platform, platform_order_id, recorded_at DESC);
|
||||
|
||||
COMMENT ON TABLE order_source_snapshots IS
|
||||
'平台订单同步的不可变原始快照;重复同步只追加,不覆盖订单主表原始报文';
|
||||
COMMENT ON COLUMN order_source_snapshots.payload_json IS
|
||||
'平台来源事件、原始报文与订单项完整快照';
|
||||
COMMENT ON COLUMN order_source_snapshots.payload_sha256 IS
|
||||
'完整快照内容 SHA-256,用于同一订单重复消息幂等';
|
||||
|
||||
CREATE OR REPLACE FUNCTION reject_order_source_snapshot_mutation()
|
||||
RETURNS TRIGGER
|
||||
LANGUAGE plpgsql
|
||||
AS $$
|
||||
BEGIN
|
||||
IF current_setting('app.allow_order_fact_repair', TRUE) = 'on' THEN
|
||||
RETURN CASE WHEN TG_OP = 'DELETE' THEN OLD ELSE NEW END;
|
||||
END IF;
|
||||
|
||||
RAISE EXCEPTION 'order_source_snapshots is append-only'
|
||||
USING ERRCODE = '23514';
|
||||
END;
|
||||
$$;
|
||||
|
||||
DROP TRIGGER IF EXISTS trg_order_source_snapshots_append_only
|
||||
ON order_source_snapshots;
|
||||
CREATE TRIGGER trg_order_source_snapshots_append_only
|
||||
BEFORE UPDATE OR DELETE ON order_source_snapshots
|
||||
FOR EACH ROW
|
||||
EXECUTE FUNCTION reject_order_source_snapshot_mutation();
|
||||
@@ -0,0 +1,75 @@
|
||||
-- 158_consignment_worker_name_sync.sql —— 打手改名后同步寄售登记人快照。
|
||||
--
|
||||
-- 背景:consignment_inventories.worker_name / consignment_submissions.worker_name
|
||||
-- 是入库/提报时的名字快照。worker_users.display_name 改名后不会自动更新,
|
||||
-- 后台寄售列表仍显示旧名,按新名搜索也搜不到。
|
||||
--
|
||||
-- 这里做两件事:
|
||||
-- 1. 用当前昵称/电话回填存量快照;
|
||||
-- 2. worker_users 改名(display_name/username/phone)时自动同步这两张表,
|
||||
-- 之后新改名无需逐表手工处理。
|
||||
--
|
||||
-- 历史工单 material_json.consignment.workerName 不做批量改写:
|
||||
-- 后台展示端按 consignment_inventories 的实时关联覆盖,保留历史 JSON 的登记痕迹。
|
||||
|
||||
UPDATE consignment_inventories ci
|
||||
SET
|
||||
worker_name = COALESCE(NULLIF(wu.display_name, ''), wu.username),
|
||||
worker_phone = wu.phone
|
||||
FROM worker_users wu
|
||||
WHERE ci.worker_id = wu.id
|
||||
AND (
|
||||
ci.worker_name IS DISTINCT FROM COALESCE(NULLIF(wu.display_name, ''), wu.username)
|
||||
OR ci.worker_phone IS DISTINCT FROM wu.phone
|
||||
);
|
||||
|
||||
UPDATE consignment_submissions cs
|
||||
SET
|
||||
worker_name = COALESCE(NULLIF(wu.display_name, ''), wu.username),
|
||||
worker_phone = wu.phone
|
||||
FROM worker_users wu
|
||||
WHERE cs.worker_id = wu.id
|
||||
AND (
|
||||
cs.worker_name IS DISTINCT FROM COALESCE(NULLIF(wu.display_name, ''), wu.username)
|
||||
OR cs.worker_phone IS DISTINCT FROM wu.phone
|
||||
);
|
||||
|
||||
CREATE OR REPLACE FUNCTION sync_worker_name_to_consignment_snapshots()
|
||||
RETURNS TRIGGER AS $$
|
||||
DECLARE
|
||||
next_worker_name TEXT := COALESCE(NULLIF(NEW.display_name, ''), NEW.username);
|
||||
BEGIN
|
||||
IF NEW.display_name IS DISTINCT FROM OLD.display_name
|
||||
OR NEW.username IS DISTINCT FROM OLD.username
|
||||
OR NEW.phone IS DISTINCT FROM OLD.phone
|
||||
THEN
|
||||
UPDATE consignment_inventories
|
||||
SET
|
||||
worker_name = next_worker_name,
|
||||
worker_phone = NEW.phone
|
||||
WHERE worker_id = NEW.id
|
||||
AND (
|
||||
worker_name IS DISTINCT FROM next_worker_name
|
||||
OR worker_phone IS DISTINCT FROM NEW.phone
|
||||
);
|
||||
|
||||
UPDATE consignment_submissions
|
||||
SET
|
||||
worker_name = next_worker_name,
|
||||
worker_phone = NEW.phone
|
||||
WHERE worker_id = NEW.id
|
||||
AND (
|
||||
worker_name IS DISTINCT FROM next_worker_name
|
||||
OR worker_phone IS DISTINCT FROM NEW.phone
|
||||
);
|
||||
END IF;
|
||||
|
||||
RETURN NEW;
|
||||
END;
|
||||
$$ LANGUAGE plpgsql;
|
||||
|
||||
DROP TRIGGER IF EXISTS trg_worker_users_consignment_name_sync ON worker_users;
|
||||
CREATE TRIGGER trg_worker_users_consignment_name_sync
|
||||
AFTER UPDATE OF display_name, username, phone ON worker_users
|
||||
FOR EACH ROW
|
||||
EXECUTE FUNCTION sync_worker_name_to_consignment_snapshots();
|
||||
Reference in New Issue
Block a user