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:
@@ -358,7 +358,12 @@ const (
|
||||
// AuditActionRefundResubmitted 表示重新提交已退回的退款申请。
|
||||
AuditActionRefundResubmitted = "refund.resubmit"
|
||||
// AuditActionRefundCommissionInvalidated 表示退款导致单条已入账佣金失效并回扣。
|
||||
// 保留常量与注册仅供历史审计读取,代码中已无调用点;现行语义见 AuditActionRefundClawbackCommission。
|
||||
AuditActionRefundCommissionInvalidated = "refund.invalidate_commission"
|
||||
// AuditActionRefundClawbackCommission 表示退款完成后生成负数、不可提现的佣金回溯明细并扣减佣金钱包。
|
||||
AuditActionRefundClawbackCommission = "refund.clawback_commission"
|
||||
// AuditActionRefundClawbackNotRequired 表示退款后处理确认原订单佣金已终态且无佣金可回溯。
|
||||
AuditActionRefundClawbackNotRequired = "refund.clawback_not_required"
|
||||
// AuditActionRefundAssetProcessed 表示退款后的套餐与资产处理已完成。
|
||||
AuditActionRefundAssetProcessed = "refund.process_asset"
|
||||
// AuditActionRefundAttemptSubmitted 表示提交或重提退款审批尝试并创建独立审批实例。
|
||||
@@ -712,6 +717,8 @@ const (
|
||||
AuditResourceApprovalInstance = "approval_instance"
|
||||
// AuditResourceCommissionRecord 表示佣金记录资源。
|
||||
AuditResourceCommissionRecord = "commission_record"
|
||||
// AuditResourceCommissionClawback 表示佣金回溯明细资源。
|
||||
AuditResourceCommissionClawback = "commission_clawback_record"
|
||||
// AuditResourceCommissionWithdrawal 表示佣金提现单资源。
|
||||
AuditResourceCommissionWithdrawal = "commission_withdrawal"
|
||||
// AuditResourceCommissionWithdrawalAttempt 表示提现审批尝试记录资源。
|
||||
@@ -948,6 +955,8 @@ const (
|
||||
AuditResourceRoleRefundTransaction = "refund_transaction"
|
||||
// AuditResourceRoleRefundCommission 表示退款导致失效的佣金记录。
|
||||
AuditResourceRoleRefundCommission = "refund_commission"
|
||||
// AuditResourceRoleRefundClawback 表示退款生成的回溯明细。
|
||||
AuditResourceRoleRefundClawback = "refund_clawback"
|
||||
// AuditResourceRoleRefundPackageUsage 表示退款后处理涉及的套餐权益。
|
||||
AuditResourceRoleRefundPackageUsage = "refund_package_usage"
|
||||
// AuditResourceRoleRefundNotification 表示退款完成通知的可靠 Outbox 事实。
|
||||
|
||||
@@ -81,17 +81,18 @@ const (
|
||||
TaskTypeAutoPurchaseAfterRecharge = "task:auto_purchase_after_recharge" // 充值后自动购包
|
||||
|
||||
// 定时任务类型(由 Asynq Scheduler 调度)
|
||||
TaskTypeAlertCheck = "alert:check" // 告警检查
|
||||
TaskTypeDataCleanup = "data:cleanup" // 数据清理
|
||||
TaskTypeNotificationCleanup = "notification:cleanup" // 站内通知保留清理
|
||||
TaskTypePackageExpiryReminder = "package:expiry:reminder" // 每日套餐临期提醒扫描
|
||||
TaskTypeDailyTrafficFlush = "traffic:daily:flush" // 每日流量落盘
|
||||
TaskTypeOutboxDeliver = "outbox:deliver" // 公共 Outbox 事件投递
|
||||
TaskTypeCardObservationSeries = "card_observation:series" // 卡观测事件序列尝试
|
||||
TaskTypeWeComApprovalSync = "wecom:approval:sync" // 企业微信审批详情异步同步
|
||||
TaskTypeWeComApprovalRecovery = "wecom:approval:recovery" // 企业微信审批主动恢复与轮询
|
||||
TaskTypeAgentRechargeRecovery = "agent_recharge:payment:recovery" // 代理在线充值支付恢复与查单
|
||||
TaskTypeRefundChannelRecovery = "refund:channel:recovery" // 渠道原路退款结果恢复与查询
|
||||
TaskTypeAlertCheck = "alert:check" // 告警检查
|
||||
TaskTypeDataCleanup = "data:cleanup" // 数据清理
|
||||
TaskTypeNotificationCleanup = "notification:cleanup" // 站内通知保留清理
|
||||
TaskTypePackageExpiryReminder = "package:expiry:reminder" // 每日套餐临期提醒扫描
|
||||
TaskTypeDailyTrafficFlush = "traffic:daily:flush" // 每日流量落盘
|
||||
TaskTypeOutboxDeliver = "outbox:deliver" // 公共 Outbox 事件投递
|
||||
TaskTypeCardObservationSeries = "card_observation:series" // 卡观测事件序列尝试
|
||||
TaskTypeWeComApprovalSync = "wecom:approval:sync" // 企业微信审批详情异步同步
|
||||
TaskTypeWeComApprovalRecovery = "wecom:approval:recovery" // 企业微信审批主动恢复与轮询
|
||||
TaskTypeAgentRechargeRecovery = "agent_recharge:payment:recovery" // 代理在线充值支付恢复与查单
|
||||
TaskTypeRefundChannelRecovery = "refund:channel:recovery" // 渠道原路退款结果恢复与查询
|
||||
TaskTypeRefundCommissionRecovery = "refund:commission:recovery" // 退款佣金回溯后处理补偿
|
||||
)
|
||||
|
||||
// 用户状态常量
|
||||
@@ -307,7 +308,7 @@ func QueueForTaskType(taskType string) string {
|
||||
return QueueCardObservationSeries
|
||||
case TaskTypeWeComApprovalSync, TaskTypeWeComApprovalRecovery:
|
||||
return QueueWeComApproval
|
||||
case TaskTypeAgentRechargeRecovery, TaskTypeRefundChannelRecovery:
|
||||
case TaskTypeAgentRechargeRecovery, TaskTypeRefundChannelRecovery, TaskTypeRefundCommissionRecovery:
|
||||
return QueueDefault
|
||||
default:
|
||||
return QueueDefault
|
||||
@@ -365,6 +366,8 @@ const (
|
||||
ExportTaskSceneRefund = "refund"
|
||||
// ExportTaskSceneExchange 表示换货记录导出场景。
|
||||
ExportTaskSceneExchange = "exchange"
|
||||
// ExportTaskSceneCommissionRecord 表示佣金明细导出场景,原佣金与回溯明细各占一行。
|
||||
ExportTaskSceneCommissionRecord = "commission_record"
|
||||
)
|
||||
|
||||
// 导出文件格式常量
|
||||
|
||||
@@ -211,6 +211,7 @@ const (
|
||||
CommissionStatusUnfreezing = 2 // 解冻中
|
||||
CommissionStatusReleased = 3 // 已发放
|
||||
CommissionStatusInvalid = 4 // 已失效
|
||||
CommissionStatusClawback = 5 // 回溯(退款完成后的负数、不可提现回溯明细)
|
||||
CommissionStatusPendingReview = 99 // 待人工修正(链路断裂,需平台处理)
|
||||
)
|
||||
|
||||
@@ -341,7 +342,7 @@ func GetNetworkStatusName(status int) string {
|
||||
}
|
||||
|
||||
// GetCommissionRecordStatusName 获取佣金记录状态名称
|
||||
// 对应 CommissionStatus* 常量:1=已冻结, 2=解冻中, 3=已发放, 4=已失效, 99=待人工修正
|
||||
// 对应 CommissionStatus* 常量:1=已冻结, 2=解冻中, 3=已发放, 4=已失效, 5=回溯, 99=待人工修正
|
||||
func GetCommissionRecordStatusName(status int) string {
|
||||
switch status {
|
||||
case CommissionStatusFrozen:
|
||||
@@ -352,6 +353,8 @@ func GetCommissionRecordStatusName(status int) string {
|
||||
return "已发放"
|
||||
case CommissionStatusInvalid:
|
||||
return "已失效"
|
||||
case CommissionStatusClawback:
|
||||
return "回溯"
|
||||
case CommissionStatusPendingReview:
|
||||
return "待人工修正"
|
||||
default:
|
||||
|
||||
Reference in New Issue
Block a user