feat(退款分佣): 佣金回溯明细替换全额失效并补齐读侧与导出
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 9m26s
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 9m26s
用 PRD 2.14 语义整体替换退款佣金「整单全额失效」实现:原佣金保持已发放不变, 回溯事实落在新表 tb_commission_clawback_record 的负数、不可提现明细上。 - 新增成对迁移 000220 建 tb_commission_clawback_record,唯一约束 (refund_id, original_commission_id) 为权威幂等键,附店铺+时间/原佣金/订单索引。 - 回溯用例(internal/service/refund/clawback.go):准入仅由退款申请状态、审批异常 标记与退款方式决定;金额按分整数计算,分母取冻结实收(缺失回落审批尝试)、 分子原路取渠道成功金额,乘法用 math/big 中间量,舍入差自末条起向前补差; 终态判据要求订单佣金已离开待计算且不存在 status IN (1,2,99) 的记录。 - 三层幂等:唯一约束兜底、佣金行行锁 + 钱包乐观锁、commission_deducted 仅作投影 并带 WHERE commission_deducted = false 条件置位;闭合三结果为已回溯、无需回溯、 审批异常转人工。 - 事务内顺序固定:锁提现申请行 → 锁尝试行 → 解冻冻结 → 置驳回 → 插回溯明细 → 扣 balance(允许为负)→ 写负数流水 → 审计;删除旧全额失效写入与其两个审计调用点, refund.invalidate_commission 仅保留常量与注册供历史审计读取。 - 读侧:佣金明细列表 status 筛选透传,两表 UNION ALL 合并分页并以 source ASC 作 末位次序键;新增佣金明细详情接口并同步路由与 OpenAPI 装配。 - 导出:新增 commission_record 场景(白名单、exporter 注册、DTO oneof、DataSource 与列定义),粒度为佣金记录,原佣金与回溯各一行,金额保持分且可为负。 - 新增退款佣金回溯周期补偿任务(@every 1m / MaxRetry(3) / Timeout(10m) / Unique(10m),独立队列),保留启动时补偿扫描,判据与既有实现一致。 Refs: AUG26-012
This commit is contained in:
16
migrations/000220_add_commission_clawback_record.down.sql
Normal file
16
migrations/000220_add_commission_clawback_record.down.sql
Normal file
@@ -0,0 +1,16 @@
|
||||
-- 回滚佣金回溯明细表。
|
||||
-- 回溯明细是资金事实,无法由回滚重建;存在记录时禁止破坏性回滚,需人工先核对资金。
|
||||
DO $$
|
||||
BEGIN
|
||||
IF EXISTS (SELECT 1 FROM tb_commission_clawback_record) THEN
|
||||
RAISE EXCEPTION '存在佣金回溯明细,禁止回滚佣金回溯明细表';
|
||||
END IF;
|
||||
END $$;
|
||||
|
||||
DROP TABLE IF EXISTS tb_commission_clawback_record;
|
||||
|
||||
-- 还原列注释为 000220 up 之前的真实值:最后一次写该注释的是
|
||||
-- migrations/archive/000029_add_one_time_commission.up.sql:94,
|
||||
-- 值即 '状态 1-已入账 2-已失效'(000113 只迁移状态值,未改注释)。
|
||||
-- 只有还原为该字面值,down 才是 up 的严格逆操作(ENG-MIG-001)。
|
||||
COMMENT ON COLUMN tb_commission_record.status IS '状态 1-已入账 2-已失效';
|
||||
56
migrations/000220_add_commission_clawback_record.up.sql
Normal file
56
migrations/000220_add_commission_clawback_record.up.sql
Normal file
@@ -0,0 +1,56 @@
|
||||
-- 佣金回溯明细表。
|
||||
-- 退款完成后的佣金回溯以独立负数、不可提现明细保存,原佣金记录保持已发放不变,
|
||||
-- 因此不复用 tb_commission_record,避免负数语义污染既有终态判定、统计与提现资格。
|
||||
-- 幂等权威为 (refund_id, original_commission_id) 唯一约束:一次退款对一条原佣金至多一条回溯明细。
|
||||
-- 不使用数据库外键,关联以 ID 保存并由应用层显式校验。
|
||||
|
||||
CREATE TABLE tb_commission_clawback_record (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
refund_id BIGINT NOT NULL,
|
||||
original_commission_id BIGINT NOT NULL,
|
||||
order_id BIGINT NOT NULL,
|
||||
shop_id BIGINT NOT NULL,
|
||||
order_no VARCHAR(30) NOT NULL DEFAULT '',
|
||||
refund_no VARCHAR(50) NOT NULL DEFAULT '',
|
||||
commission_source VARCHAR(20) NOT NULL,
|
||||
amount BIGINT NOT NULL,
|
||||
balance_after BIGINT NOT NULL DEFAULT 0,
|
||||
withdrawable BOOLEAN NOT NULL DEFAULT FALSE,
|
||||
status INTEGER NOT NULL DEFAULT 5,
|
||||
-- 列类型与合并分页的另一支 tb_commission_record.created_at 保持一致(均不带时区),
|
||||
-- 否则 UNION ALL 会按会话时区改写其中一支,破坏统一排序键与时间筛选口径。
|
||||
created_at TIMESTAMP NOT NULL DEFAULT NOW(),
|
||||
CONSTRAINT uk_commission_clawback_refund_original UNIQUE (refund_id, original_commission_id),
|
||||
CONSTRAINT chk_commission_clawback_ids CHECK (refund_id > 0 AND original_commission_id > 0 AND order_id > 0 AND shop_id > 0),
|
||||
CONSTRAINT chk_commission_clawback_amount CHECK (amount < 0),
|
||||
CONSTRAINT chk_commission_clawback_withdrawable CHECK (withdrawable = FALSE),
|
||||
CONSTRAINT chk_commission_clawback_status CHECK (status = 5)
|
||||
);
|
||||
|
||||
-- 列表按店铺 + 生成时间倒序合并分页;id 为次序键,避免同秒记录翻页抖动。
|
||||
CREATE INDEX idx_commission_clawback_shop_created
|
||||
ON tb_commission_clawback_record (shop_id, created_at DESC, id DESC);
|
||||
-- 反向关联原佣金:剩余可回溯余额按原佣金聚合已生成的回溯累计。
|
||||
CREATE INDEX idx_commission_clawback_original
|
||||
ON tb_commission_clawback_record (original_commission_id);
|
||||
-- 订单维度核对一次订单退款产生的全部回溯事实。
|
||||
CREATE INDEX idx_commission_clawback_order
|
||||
ON tb_commission_clawback_record (order_id);
|
||||
|
||||
COMMENT ON TABLE tb_commission_clawback_record IS '佣金回溯明细,退款完成后生成的负数、不可提现佣金事实,原佣金记录保持不变';
|
||||
COMMENT ON COLUMN tb_commission_clawback_record.id IS '主键';
|
||||
COMMENT ON COLUMN tb_commission_clawback_record.refund_id IS '来源退款申请ID,与原始佣金ID共同构成幂等唯一键';
|
||||
COMMENT ON COLUMN tb_commission_clawback_record.original_commission_id IS '被回溯的原佣金记录ID(tb_commission_record.id),原记录状态与金额不变';
|
||||
COMMENT ON COLUMN tb_commission_clawback_record.order_id IS '原佣金关联订单ID快照';
|
||||
COMMENT ON COLUMN tb_commission_clawback_record.shop_id IS '佣金归属店铺ID,列表与导出按此应用数据范围';
|
||||
COMMENT ON COLUMN tb_commission_clawback_record.order_no IS '原订单号快照';
|
||||
COMMENT ON COLUMN tb_commission_clawback_record.refund_no IS '来源退款单号快照';
|
||||
COMMENT ON COLUMN tb_commission_clawback_record.commission_source IS '原佣金来源快照:cost_diff 成本价差、one_time 一次性佣金';
|
||||
COMMENT ON COLUMN tb_commission_clawback_record.amount IS '回溯金额(分),恒为负数';
|
||||
COMMENT ON COLUMN tb_commission_clawback_record.balance_after IS '回溯后佣金钱包实际余额(分),允许为负';
|
||||
COMMENT ON COLUMN tb_commission_clawback_record.withdrawable IS '是否可提现,回溯明细恒为不可提现';
|
||||
COMMENT ON COLUMN tb_commission_clawback_record.status IS '状态 5-回溯,与 pkg/constants.CommissionStatusClawback 一致';
|
||||
COMMENT ON COLUMN tb_commission_clawback_record.created_at IS '生成时间';
|
||||
|
||||
-- 原佣金记录状态新增 5-回溯枚举(回溯明细不写本表,仅同步列注释)。
|
||||
COMMENT ON COLUMN tb_commission_record.status IS '状态 1-已冻结 2-解冻中 3-已发放 4-已失效 5-回溯 99-待人工修正';
|
||||
Reference in New Issue
Block a user