修复(#16): 修复订单退款状态与后台恢复冲突 (#16)

Co-authored-by: multica-agent <github@multica.ai>

queue/logic/order/activateOrderLogic.go

@@ -49,6 +49,7 @@ const (
 	OrderStatusClose    = 3 // Order closed/cancelled
 	OrderStatusFailed   = 4 // Order processing failed
 	OrderStatusClaimed  = 6 // Internal transient claim while a worker processes the order
+	OrderStatusRefunded = 7 // Order refunded terminal state
 	OrderStatusFinished = 5 // Order successfully completed
 )
 
@@ -272,25 +273,6 @@ func (l *ActivateOrderLogic) claimAndGetOrder(ctx context.Context, orderNo strin
 }
 
 func (l *ActivateOrderLogic) releaseClaim(ctx context.Context, orderNo string) error {
-	// 终态守卫：OrderStatusClaimed(6) 与 orderStatusRefunded(6) 共用同一枚举值。
-	// 若已存在 333 退款日志，说明此处的 status=6 是「已退款」，不能再降回 5，
-	// 否则下次 activate 会重新激活订阅、且管理员可二次触发退款导致佣金被多次扣减。
-	// 详见 HIF-131 / HIF-132。
-	refunded, err := log.HasRefundCommissionLog(l.svc.DB.WithContext(ctx), orderNo)
-	if err != nil {
-		logger.WithContext(ctx).Error("Check refund log before release claim failed",
-			logger.Field("error", err.Error()),
-			logger.Field("order_no", orderNo),
-		)
-		return fmt.Errorf("check refund log failed for order %s: %w", orderNo, err)
-	}
-	if refunded {
-		logger.WithContext(ctx).Info("Skip release claim for refunded order (status=6 + refund log)",
-			logger.Field("order_no", orderNo),
-		)
-		return nil
-	}
-
 	if err := l.svc.DB.WithContext(ctx).
 		Model(&order.Order{}).
 		Where("order_no = ? AND status = ?", orderNo, OrderStatusClaimed).

queue/logic/order/order_status_recovery_test.go

@@ -0,0 +1,78 @@
+package orderLogic
+
+import (
+	"context"
+	"fmt"
+	"strings"
+	"testing"
+
+	"github.com/DATA-DOG/go-sqlmock"
+	"github.com/perfect-panel/server/internal/svc"
+	"gorm.io/driver/mysql"
+	"gorm.io/gorm"
+)
+
+func TestReleaseClaimOnlyReleasesClaimedStatus(t *testing.T) {
+	const orderNo = "ORD-CLAIMED-1"
+
+	db, mock, cleanup := newOrderQueueTestDB(t)
+	defer cleanup()
+
+	mock.ExpectBegin()
+	mock.ExpectExec("UPDATE `order`").
+		WithArgs(OrderStatusPaid, sqlmock.AnyArg(), orderNo, OrderStatusClaimed).
+		WillReturnResult(sqlmock.NewResult(0, 1))
+	mock.ExpectCommit()
+
+	logic := NewActivateOrderLogic(&svc.ServiceContext{DB: db})
+	if err := logic.releaseClaim(context.Background(), orderNo); err != nil {
+		t.Fatalf("releaseClaim error: %v", err)
+	}
+	assertOrderQueueExpectations(t, mock)
+}
+
+func TestStuckOrderRecoveryScansOnlyClaimedStatus(t *testing.T) {
+	db, mock, cleanup := newOrderQueueTestDB(t)
+	defer cleanup()
+
+	mock.ExpectQuery("FROM `order`").
+		WithArgs(OrderStatusClaimed, sqlmock.AnyArg()).
+		WillReturnRows(sqlmock.NewRows([]string{"id", "order_no", "status"}))
+
+	logic := NewStuckOrderRecoveryLogic(&svc.ServiceContext{DB: db})
+	if err := logic.ProcessTask(context.Background(), nil); err != nil {
+		t.Fatalf("ProcessTask error: %v", err)
+	}
+	assertOrderQueueExpectations(t, mock)
+}
+
+func newOrderQueueTestDB(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 assertOrderQueueExpectations(t *testing.T, mock sqlmock.Sqlmock) {
+	t.Helper()
+	if err := mock.ExpectationsWereMet(); err != nil {
+		t.Fatalf("unmet sql expectations: %v", err)
+	}
+}

queue/logic/order/stuckOrderRecoveryLogic.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/hibiken/asynq"
-	logmodel "github.com/perfect-panel/server/internal/model/log"
 	"github.com/perfect-panel/server/internal/model/order"
 	"github.com/perfect-panel/server/internal/svc"
 	"github.com/perfect-panel/server/pkg/logger"
@@ -55,25 +54,6 @@ func (l *StuckOrderRecoveryLogic) ProcessTask(ctx context.Context, _ *asynq.Task
 	for i := range stuckOrders {
 		o := &stuckOrders[i]
 
-		// 终态守卫：OrderStatusClaimed(6) 与 orderStatusRefunded(6) 共用同一枚举值，
-		// 若该订单已写入 333 退款佣金日志，说明状态 6 表示「已退款」而非「短暂 claim」，
-		// 必须跳过，否则会把已退款订单重置为 5 + 重新入队 activate，导致重复退款。
-		// 详见 HIF-131 / HIF-132。
-		refunded, err := logmodel.HasRefundCommissionLog(l.svc.DB.WithContext(ctx), o.OrderNo)
-		if err != nil {
-			logger.WithContext(ctx).Error("[StuckOrderRecovery] Failed to check refund log",
-				logger.Field("order_no", o.OrderNo),
-				logger.Field("error", err.Error()),
-			)
-			continue
-		}
-		if refunded {
-			logger.WithContext(ctx).Info("[StuckOrderRecovery] Skip refunded order (status=6 + refund log)",
-				logger.Field("order_no", o.OrderNo),
-			)
-			continue
-		}
-
 		result := l.svc.DB.WithContext(ctx).
 			Model(&order.Order{}).
 			Where("order_no = ? AND status = ?", o.OrderNo, OrderStatusClaimed).