修复(#132): 退款幂等校验 + 已退款订单防重新激活
Build docker and publish / build (20.15.1) (push) Failing after 21m4s
Build docker and publish / build (20.15.1) (pull_request) Failing after 21m47s

P01:refundOrderLogic.RefundOrder 在事务内 FOR UPDATE 后、lockCommissionSource 前新增
333 退款日志扫描,命中即返回 OrderAlreadyRefunded(61006),不再写日志/扣 commission/
改 order.status。

P02:堵住已退款订单状态被回退入口
- queue/logic/order/stuckOrderRecoveryLogic.go:批扫 status=6 时新增 333 日志守卫,
  已退款订单不再被重置为 5 + 重新入队 activate(HIF-131 trace 中订单 53647 被刷回 5
  的真凶)
- queue/logic/order/activateOrderLogic.go:releaseClaim 同步加守卫做防御性兜底

新增 internal/model/log/refund.go 共享 helper HasRefundCommissionLog:
type=33 + content LIKE 走索引粗筛,再 JSON 反序列化确认 content.type==333 AND
content.order_no==orderNo,防 LIKE 子串误判。

测试:单元测试覆盖正常退款 / 已有 333 日志拒绝 / 子串误判防御 / 脏 JSON 容错;
sqlmock 严格断言命中后事务序列只含 BEGIN/SELECT order FOR UPDATE/SELECT
system_logs/ROLLBACK,无任何 commission 写入。

不做:calculateCommission、status 枚举拆分、表结构变更、支付通道 notify、用户余额回补。

Co-authored-by: multica-agent <github@multica.ai>
This commit is contained in:
2026-05-31 20:19:35 -07:00
parent 7236ca4cf2
commit 5b9f384f81
6 changed files with 431 additions and 0 deletions
+38
View File
@@ -0,0 +1,38 @@
package log
import (
"fmt"
"gorm.io/gorm"
)
// HasRefundCommissionLog 判断指定订单号是否已写入 333 退款佣金日志。
// 用于 refund 主流程做幂等校验,以及 stuck-order recovery / activate worker
// 区分「已退款」(terminal)与「短暂 claimed」(transient)这两种共用 status=6
// 的语义。
//
// 实现细节:
// 1. type=33 + content LIKE '%"order_no":"<orderNo>"%' 先走索引粗筛;
// 2. 命中项再用 JSON 反序列化精确比对 content.type==333 与 content.order_no
// 避免 order_no 出现在其它字段子串里产生误判。
func HasRefundCommissionLog(tx *gorm.DB, orderNo string) (bool, error) {
if orderNo == "" {
return false, nil
}
var logs []SystemLog
if err := tx.Model(&SystemLog{}).
Where("type = ? AND content LIKE ?", TypeCommission.Uint8(), fmt.Sprintf("%%\"order_no\":\"%s\"%%", orderNo)).
Find(&logs).Error; err != nil {
return false, fmt.Errorf("query refund commission log failed: %w", err)
}
for _, item := range logs {
var content Commission
if err := content.Unmarshal([]byte(item.Content)); err != nil {
continue
}
if content.Type == CommissionTypeRefund && content.OrderNo == orderNo {
return true, nil
}
}
return false, nil
}
+172
View File
@@ -0,0 +1,172 @@
package log
import (
"fmt"
"strings"
"testing"
"github.com/DATA-DOG/go-sqlmock"
"gorm.io/driver/mysql"
"gorm.io/gorm"
)
func TestHasRefundCommissionLog(t *testing.T) {
const orderNo = "ORD-REFUND-1"
t.Run("returns true when 333 log exists for the order", func(t *testing.T) {
db, mock, cleanup := newRefundLogTestDB(t)
defer cleanup()
mock.ExpectQuery("FROM `system_logs`").
WithArgs(uint8(33), fmt.Sprintf(`%%"order_no":"%s"%%`, orderNo)).
WillReturnRows(sqlmock.NewRows([]string{"id", "content"}).
AddRow(1, fmt.Sprintf(`{"type":331,"order_no":"%s","amount":100}`, orderNo)).
AddRow(2, fmt.Sprintf(`{"type":333,"order_no":"%s","amount":-100}`, orderNo)))
got, err := HasRefundCommissionLog(db, orderNo)
if err != nil {
t.Fatalf("HasRefundCommissionLog error: %v", err)
}
if !got {
t.Fatalf("HasRefundCommissionLog = false, want true")
}
assertRefundLogExpectations(t, mock)
})
t.Run("returns false when only 331/332 logs exist", func(t *testing.T) {
db, mock, cleanup := newRefundLogTestDB(t)
defer cleanup()
mock.ExpectQuery("FROM `system_logs`").
WithArgs(uint8(33), fmt.Sprintf(`%%"order_no":"%s"%%`, orderNo)).
WillReturnRows(sqlmock.NewRows([]string{"id", "content"}).
AddRow(1, fmt.Sprintf(`{"type":331,"order_no":"%s","amount":100}`, orderNo)).
AddRow(2, fmt.Sprintf(`{"type":332,"order_no":"%s","amount":50}`, orderNo)))
got, err := HasRefundCommissionLog(db, orderNo)
if err != nil {
t.Fatalf("HasRefundCommissionLog error: %v", err)
}
if got {
t.Fatalf("HasRefundCommissionLog = true, want false")
}
assertRefundLogExpectations(t, mock)
})
t.Run("returns false when no log exists for the order", func(t *testing.T) {
db, mock, cleanup := newRefundLogTestDB(t)
defer cleanup()
mock.ExpectQuery("FROM `system_logs`").
WithArgs(uint8(33), fmt.Sprintf(`%%"order_no":"%s"%%`, orderNo)).
WillReturnRows(sqlmock.NewRows([]string{"id", "content"}))
got, err := HasRefundCommissionLog(db, orderNo)
if err != nil {
t.Fatalf("HasRefundCommissionLog error: %v", err)
}
if got {
t.Fatalf("HasRefundCommissionLog = true, want false")
}
assertRefundLogExpectations(t, mock)
})
t.Run("returns false for empty order_no without querying", func(t *testing.T) {
db, mock, cleanup := newRefundLogTestDB(t)
defer cleanup()
got, err := HasRefundCommissionLog(db, "")
if err != nil {
t.Fatalf("HasRefundCommissionLog error: %v", err)
}
if got {
t.Fatalf("HasRefundCommissionLog = true, want false")
}
assertRefundLogExpectations(t, mock)
})
t.Run("ignores 333 log when order_no in content does not match", func(t *testing.T) {
// Defensive: LIKE pattern may match a substring; JSON match catches it.
db, mock, cleanup := newRefundLogTestDB(t)
defer cleanup()
mock.ExpectQuery("FROM `system_logs`").
WithArgs(uint8(33), fmt.Sprintf(`%%"order_no":"%s"%%`, orderNo)).
WillReturnRows(sqlmock.NewRows([]string{"id", "content"}).
AddRow(1, `{"type":333,"order_no":"OTHER","amount":-100}`))
got, err := HasRefundCommissionLog(db, orderNo)
if err != nil {
t.Fatalf("HasRefundCommissionLog error: %v", err)
}
if got {
t.Fatalf("HasRefundCommissionLog = true, want false (different order_no)")
}
assertRefundLogExpectations(t, mock)
})
t.Run("ignores malformed json content", func(t *testing.T) {
db, mock, cleanup := newRefundLogTestDB(t)
defer cleanup()
mock.ExpectQuery("FROM `system_logs`").
WithArgs(uint8(33), fmt.Sprintf(`%%"order_no":"%s"%%`, orderNo)).
WillReturnRows(sqlmock.NewRows([]string{"id", "content"}).
AddRow(1, `not a json`).
AddRow(2, fmt.Sprintf(`{"type":333,"order_no":"%s","amount":-100}`, orderNo)))
got, err := HasRefundCommissionLog(db, orderNo)
if err != nil {
t.Fatalf("HasRefundCommissionLog error: %v", err)
}
if !got {
t.Fatalf("HasRefundCommissionLog = false, want true")
}
assertRefundLogExpectations(t, mock)
})
t.Run("returns error when db query fails", func(t *testing.T) {
db, mock, cleanup := newRefundLogTestDB(t)
defer cleanup()
mock.ExpectQuery("FROM `system_logs`").
WithArgs(uint8(33), fmt.Sprintf(`%%"order_no":"%s"%%`, orderNo)).
WillReturnError(fmt.Errorf("connection lost"))
if _, err := HasRefundCommissionLog(db, orderNo); err == nil {
t.Fatalf("expected error, got nil")
}
assertRefundLogExpectations(t, mock)
})
}
func newRefundLogTestDB(t *testing.T) (*gorm.DB, sqlmock.Sqlmock, func()) {
t.Helper()
sqlDB, mock, err := sqlmock.New(sqlmock.QueryMatcherOption(sqlmock.QueryMatcherFunc(func(expectedSQL, actualSQL string) error {
if strings.Contains(actualSQL, expectedSQL) {
return nil
}
return fmt.Errorf("actual sql %q does not contain %q", actualSQL, expectedSQL)
})))
if err != nil {
t.Fatalf("create sqlmock: %v", err)
}
db, err := gorm.Open(mysql.New(mysql.Config{Conn: sqlDB, SkipInitializeWithVersion: true}), &gorm.Config{})
if err != nil {
_ = sqlDB.Close()
t.Fatalf("open gorm db: %v", err)
}
return db, mock, func() {
_ = sqlDB.Close()
}
}
func assertRefundLogExpectations(t *testing.T, mock sqlmock.Sqlmock) {
t.Helper()
if err := mock.ExpectationsWereMet(); err != nil {
t.Fatalf("unmet sql expectations: %v", err)
}
}