wangjia/pay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(v2): 退款自愈扫描加回溯窗(防 LIMIT 尾部饥饿)+ 清死行

Browse Source 
RefundApplyTask 的候选查询按 out_trade_no ASC/id ASC 取前 200,succeeded 退款历史
只增不减、partially_refunded 长期驻留,超过 limit 后最新的崩溃窗口永远排在候选外
扫不到。两路查询都加 since 回溯窗:RefundStore.ListDistinctOutTradeNosByStatusSince
(completed_at>=since)、OrderStore.ListOrdersByStatusSince(updated_at>=since),旧的
无窗方法原样保留。RefundApplyTask 新增 lookback/now 参数,config.ReconcileConfig 新增
RefundApplyLookbackMin(默认 48h)。顺带按 T6 复审补 OrderTTLMin 字段注释(须 ≫ crypto
orderTTL 15min),清 sync_test.go 死行 `_ = time.Second`。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013nMthbVEmQquxBRKb9Fj8u
This commit is contained in:
wangjia
2026-07-10 17:59:57 +08:00
parent 727ed74899
commit 9117de7dcf
9 changed files with 212 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/reconcile/refund_apply.go
+10 -4
View File
@@ -23,14 +23,20 @@ import (
// 候选订单 = distinct(有 succeeded 退款的订单) ∪ (当前处于 refunding/partially_refunded
// 态的订单):前者直接命中"退款成功但订单未跟上"的崩溃窗口;后者兜住"已在退款流程
// 中、但后续又有退款 succeeded 未被重算"的情形。
func RefundApplyTask(orders *store.OrderStore, refunds *store.RefundStore, limit int) func(ctx context.Context) error {
//
// 两路查询都带 lookback 回溯窗(since = now-lookback),防「LIMIT 尾部饥饿」:succeeded
// 退款历史只增不减、partially_refunded 订单长期驻留,若不设窗口按 ASC 取前 limit 条,
// 超过 limit 后最新的崩溃窗口(本扫描要自愈的目标)会被挤出候选、永远扫不到。lookback
// 只覆盖近期崩溃窗口——历史一致性由已收敛状态保证,不需要扫全表。
func RefundApplyTask(orders *store.OrderStore, refunds *store.RefundStore, lookback time.Duration, now func() time.Time, limit int) func(ctx context.Context) error {
return func(ctx context.Context) error {
succeededNos, err := refunds.ListDistinctOutTradeNosByStatus(model.RefundSucceeded, limit)
since := now().Add(-lookback)
succeededNos, err := refunds.ListDistinctOutTradeNosByStatusSince(model.RefundSucceeded, since, limit)
if err != nil {
return err
}
refundingOrders, err := orders.ListOrdersByStatus(
[]model.OrderStatusV2{model.OrderRefundingV2, model.OrderPartRefundedV2}, limit)
refundingOrders, err := orders.ListOrdersByStatusSince(
[]model.OrderStatusV2{model.OrderRefundingV2, model.OrderPartRefundedV2}, since, limit)
if err != nil {
return err
}
internal/reconcile/refund_apply_test.go
+104 -7
View File
@@ -25,12 +25,13 @@ func TestRefundApplyTaskSelfHealsStuckPaidOrder(t *testing.T) {
if err := orders.CreateOrder(&model.OrderV2{OutTradeNo: "STUCK-1", AmountMinor: 10000, Currency: "CNY", Status: model.OrderPaidV2}); err != nil {
t.Fatal(err)
}
completedAt := time.Now()
if err := refunds.CreateRefund(&model.Refund{RefundID: "rf-stuck-1", OutTradeNo: "STUCK-1", AttemptProviderRef: "STUCK-1",
AmountMinor: 10000, Currency: "CNY", Status: model.RefundSucceeded, InitiatedBy: "business"}); err != nil {
AmountMinor: 10000, Currency: "CNY", Status: model.RefundSucceeded, InitiatedBy: "business", CompletedAt: &completedAt}); err != nil {
t.Fatal(err)
}
task := reconcile.RefundApplyTask(orders, refunds, 200)
task := reconcile.RefundApplyTask(orders, refunds, 48*time.Hour, time.Now, 200)
if err := task(context.Background()); err != nil {
t.Fatalf("task: %v", err)
}
@@ -51,12 +52,13 @@ func TestRefundApplyTaskPartialStaysPartial(t *testing.T) {
if err := orders.CreateOrder(&model.OrderV2{OutTradeNo: "STUCK-2", AmountMinor: 10000, Currency: "CNY", Status: model.OrderPaidV2}); err != nil {
t.Fatal(err)
}
completedAt := time.Now()
if err := refunds.CreateRefund(&model.Refund{RefundID: "rf-stuck-2", OutTradeNo: "STUCK-2", AttemptProviderRef: "STUCK-2",
AmountMinor: 4000, Currency: "CNY", Status: model.RefundSucceeded, InitiatedBy: "business"}); err != nil {
AmountMinor: 4000, Currency: "CNY", Status: model.RefundSucceeded, InitiatedBy: "business", CompletedAt: &completedAt}); err != nil {
t.Fatal(err)
}
task := reconcile.RefundApplyTask(orders, refunds, 200)
task := reconcile.RefundApplyTask(orders, refunds, 48*time.Hour, time.Now, 200)
if err := task(context.Background()); err != nil {
t.Fatalf("task: %v", err)
}
@@ -76,12 +78,13 @@ func TestRefundApplyTaskIdempotentNoOpOnRerun(t *testing.T) {
if err := orders.CreateOrder(&model.OrderV2{OutTradeNo: "STUCK-3", AmountMinor: 5000, Currency: "CNY", Status: model.OrderPaidV2}); err != nil {
t.Fatal(err)
}
completedAt := time.Now()
if err := refunds.CreateRefund(&model.Refund{RefundID: "rf-stuck-3", OutTradeNo: "STUCK-3", AttemptProviderRef: "STUCK-3",
AmountMinor: 5000, Currency: "CNY", Status: model.RefundSucceeded, InitiatedBy: "business"}); err != nil {
AmountMinor: 5000, Currency: "CNY", Status: model.RefundSucceeded, InitiatedBy: "business", CompletedAt: &completedAt}); err != nil {
t.Fatal(err)
}
task := reconcile.RefundApplyTask(orders, refunds, 200)
task := reconcile.RefundApplyTask(orders, refunds, 48*time.Hour, time.Now, 200)
for i := 0; i < 3; i++ {
if err := task(context.Background()); err != nil {
t.Fatalf("run %d: %v", i, err)
@@ -109,7 +112,7 @@ func TestRefundApplyTaskConsistentOrderUntouched(t *testing.T) {
t.Fatal(err)
}
task := reconcile.RefundApplyTask(orders, refunds, 200)
task := reconcile.RefundApplyTask(orders, refunds, 48*time.Hour, time.Now, 200)
if err := task(context.Background()); err != nil {
t.Fatalf("task: %v", err)
}
@@ -119,6 +122,100 @@ func TestRefundApplyTaskConsistentOrderUntouched(t *testing.T) {
}
}
// TestRefundApplyTaskLookbackWindowExcludesStaleSucceeded 钉住 LIMIT 尾部饥饿修复:
// succeeded 退款侧的候选查询带回溯窗,completed_at 超窗的行不再入候选(窗外订单卡在
// paid 不被自愈),只有窗内的才被扫到并自愈。
func TestRefundApplyTaskLookbackWindowExcludesStaleSucceeded(t *testing.T) {
db := model.OpenTestDB(t)
orders := store.NewOrderStore(db)
refunds := store.NewRefundStore(db)
now := time.Date(2026, 7, 10, 12, 0, 0, 0, time.UTC)
lookback := 48 * time.Hour
if err := orders.CreateOrder(&model.OrderV2{OutTradeNo: "WIN-OLD", AmountMinor: 10000, Currency: "CNY", Status: model.OrderPaidV2}); err != nil {
t.Fatal(err)
}
staleCompleted := now.Add(-lookback - time.Hour) // 窗外
if err := refunds.CreateRefund(&model.Refund{RefundID: "rf-win-old", OutTradeNo: "WIN-OLD", AttemptProviderRef: "WIN-OLD",
AmountMinor: 10000, Currency: "CNY", Status: model.RefundSucceeded, InitiatedBy: "business", CompletedAt: &staleCompleted}); err != nil {
t.Fatal(err)
}
if err := orders.CreateOrder(&model.OrderV2{OutTradeNo: "WIN-NEW", AmountMinor: 10000, Currency: "CNY", Status: model.OrderPaidV2}); err != nil {
t.Fatal(err)
}
freshCompleted := now.Add(-time.Hour) // 窗内
if err := refunds.CreateRefund(&model.Refund{RefundID: "rf-win-new", OutTradeNo: "WIN-NEW", AttemptProviderRef: "WIN-NEW",
AmountMinor: 10000, Currency: "CNY", Status: model.RefundSucceeded, InitiatedBy: "business", CompletedAt: &freshCompleted}); err != nil {
t.Fatal(err)
}
task := reconcile.RefundApplyTask(orders, refunds, lookback, func() time.Time { return now }, 200)
if err := task(context.Background()); err != nil {
t.Fatalf("task: %v", err)
}
oldOrder, err := orders.GetOrder("WIN-OLD")
if err != nil || oldOrder.Status != model.OrderPaidV2 {
t.Fatalf("窗外行不应入候选、不应被自愈, got %+v, err=%v", oldOrder, err)
}
newOrder, err := orders.GetOrder("WIN-NEW")
if err != nil || newOrder.Status != model.OrderRefundedV2 {
t.Fatalf("窗内行应被自愈为 refunded, got %+v, err=%v", newOrder, err)
}
}
// TestRefundApplyTaskLookbackWindowExcludesStaleRefundingOrder 同上,针对
// refunding/partially_refunded 订单侧的候选查询:updated_at 超窗的订单不再入候选
// (即便它挂着可自愈的 succeeded 退款,只要两路查询都被窗口挡在外面就不会被扫到)。
func TestRefundApplyTaskLookbackWindowExcludesStaleRefundingOrder(t *testing.T) {
db := model.OpenTestDB(t)
orders := store.NewOrderStore(db)
refunds := store.NewRefundStore(db)
now := time.Date(2026, 7, 10, 12, 0, 0, 0, time.UTC)
lookback := 48 * time.Hour
staleAt := now.Add(-lookback - time.Hour) // 窗外
freshAt := now.Add(-time.Hour) // 窗内
// 两笔订单的 succeeded 退款 completed_at 都设窗外,隔离掉「succeeded 侧候选」这条路径
// ——只让 refunding/partially_refunded 订单侧的时间窗单独决定是否入候选。
if err := orders.CreateOrder(&model.OrderV2{OutTradeNo: "ORD-OLD", AmountMinor: 10000, Currency: "CNY", Status: model.OrderRefundingV2}); err != nil {
t.Fatal(err)
}
if err := refunds.CreateRefund(&model.Refund{RefundID: "rf-ord-old", OutTradeNo: "ORD-OLD", AttemptProviderRef: "ORD-OLD",
AmountMinor: 10000, Currency: "CNY", Status: model.RefundSucceeded, InitiatedBy: "business", CompletedAt: &staleAt}); err != nil {
t.Fatal(err)
}
if err := db.Model(&model.OrderV2{}).Where("out_trade_no = ?", "ORD-OLD").Update("updated_at", staleAt).Error; err != nil {
t.Fatal(err)
}
if err := orders.CreateOrder(&model.OrderV2{OutTradeNo: "ORD-NEW", AmountMinor: 10000, Currency: "CNY", Status: model.OrderRefundingV2}); err != nil {
t.Fatal(err)
}
if err := refunds.CreateRefund(&model.Refund{RefundID: "rf-ord-new", OutTradeNo: "ORD-NEW", AttemptProviderRef: "ORD-NEW",
AmountMinor: 10000, Currency: "CNY", Status: model.RefundSucceeded, InitiatedBy: "business", CompletedAt: &staleAt}); err != nil {
t.Fatal(err)
}
if err := db.Model(&model.OrderV2{}).Where("out_trade_no = ?", "ORD-NEW").Update("updated_at", freshAt).Error; err != nil {
t.Fatal(err)
}
task := reconcile.RefundApplyTask(orders, refunds, lookback, func() time.Time { return now }, 200)
if err := task(context.Background()); err != nil {
t.Fatalf("task: %v", err)
}
oldOrder, err := orders.GetOrder("ORD-OLD")
if err != nil || oldOrder.Status != model.OrderRefundingV2 {
t.Fatalf("窗外订单不应入候选、不应被自愈, got %+v, err=%v", oldOrder, err)
}
newOrder, err := orders.GetOrder("ORD-NEW")
if err != nil || newOrder.Status != model.OrderRefundedV2 {
t.Fatalf("窗内订单应被自愈为 refunded, got %+v, err=%v", newOrder, err)
}
}
// TestRefundStuckAlertTaskLogsWarnWithoutChangingState 卡滞 processing/manual_pending
// 超阈值只应打 WARN 日志,不改任何状态(观测型)。
func TestRefundStuckAlertTaskLogsWarnWithoutChangingState(t *testing.T) {
internal/reconcile/sync_test.go
-1
View File
@@ -49,7 +49,6 @@ func TestSyncPendingTaskSettlesViaQuery(t *testing.T) {
if o.Status != model.OrderPaidV2 {
t.Fatalf("查单对账后应 paid, got %v", o.Status)
}
_ = time.Second
}
func TestPaidSpotCheckTaskRunsCleanOnConsistent(t *testing.T) {