优化订单履约状态处理

2026-07-31 16:28:30 +08:00
parent a091806283
commit 677bdbbc1c
11 changed files with 488 additions and 52 deletions
@@ -3,6 +3,7 @@ package service
 import (
 	"strings"
 	"testing"
+	"time"

 	"affiliate_dash/internal/model"
 	"affiliate_dash/internal/testdb"
@@ -89,6 +90,9 @@ func TestFulfillmentCreateOrderDebitsWalletAndIsIdempotent(t *testing.T) {
 		ClientOrderNo: "client-001",
 		SKU:           product.SKU,
 		Quantity:      2,
+		RequestData: map[string]string{
+			"account": "player-1",
+		},
 	})
 	if err != nil {
 		t.Fatalf("idempotent create: %v", err)
@@ -118,6 +122,53 @@ func TestFulfillmentCreateOrderDebitsWalletAndIsIdempotent(t *testing.T) {
 	}
 }

+func TestFulfillmentCreateOrderRejectsIdempotencyMismatch(t *testing.T) {
+	db := newServiceTestDB(t)
+	merchantID, product := seedFulfillmentMerchant(t, db, "merchant-idempotency-mismatch", 1000, 5, 200)
+	svc := NewFulfillmentService(db, nil)
+
+	first, err := svc.CreateOrder(CreateFulfillmentOrderInput{
+		MerchantID:     merchantID,
+		APIClientID:    11,
+		ClientOrderNo:  "client-mismatch",
+		SKU:            product.SKU,
+		Quantity:       1,
+		BuyerReference: "buyer-a",
+	})
+	if err != nil {
+		t.Fatalf("create order: %v", err)
+	}
+	_, err = svc.CreateOrder(CreateFulfillmentOrderInput{
+		MerchantID:     merchantID,
+		APIClientID:    11,
+		ClientOrderNo:  "client-mismatch",
+		SKU:            product.SKU,
+		Quantity:       2,
+		BuyerReference: "buyer-a",
+	})
+	if err == nil || !strings.Contains(err.Error(), "请求参数与原订单不一致") {
+		t.Fatalf("expected idempotency mismatch, got %v", err)
+	}
+
+	var wallet model.WalletAccount
+	if err := db.Where("merchant_id = ?", merchantID).First(&wallet).Error; err != nil {
+		t.Fatalf("query wallet: %v", err)
+	}
+	if wallet.AvailableBalance != 800 {
+		t.Fatalf("wallet should debit first order only, got %d", wallet.AvailableBalance)
+	}
+	var refreshed model.MerchantProduct
+	if err := db.First(&refreshed, product.ID).Error; err != nil {
+		t.Fatalf("query product: %v", err)
+	}
+	if refreshed.Stock != 4 {
+		t.Fatalf("stock should decrease once, got %d", refreshed.Stock)
+	}
+	if first.Order.RequestFingerprint == "" {
+		t.Fatalf("request fingerprint should be stored")
+	}
+}
+
 func TestDashboardScopesPlatformAndMerchantData(t *testing.T) {
 	db := newServiceTestDB(t)
 	merchantA, productA := seedFulfillmentMerchant(t, db, "dashboard-a", 1000, 5, 100)
@@ -342,6 +393,91 @@ func TestFulfillmentStatusTransitions(t *testing.T) {
 	}
 }

+func TestMarkProcessingTimeoutsMarksStaleOrdersFailed(t *testing.T) {
+	db := newServiceTestDB(t)
+	merchantID, product := seedFulfillmentMerchant(t, db, "merchant-timeout", 1000, -1, 100)
+	svc := NewFulfillmentService(db, nil)
+	created, err := svc.CreateOrder(CreateFulfillmentOrderInput{
+		MerchantID:    merchantID,
+		APIClientID:   13,
+		ClientOrderNo: "client-timeout",
+		SKU:           product.SKU,
+	})
+	if err != nil {
+		t.Fatalf("create order: %v", err)
+	}
+	processing, err := svc.UpdateFulfillment(FulfillmentUpdateInput{
+		MerchantID:  merchantID,
+		APIClientID: 13,
+		OrderNo:     created.Order.OrderNo,
+		Status:      model.FulfillmentStatusProcessing,
+	})
+	if err != nil {
+		t.Fatalf("mark processing: %v", err)
+	}
+	if err := db.Model(&model.FulfillmentOrder{}).
+		Where("id = ?", processing.ID).
+		Update("updated_at", time.Now().Add(-time.Hour)).Error; err != nil {
+		t.Fatalf("age processing order: %v", err)
+	}
+
+	changed, err := svc.MarkProcessingTimeouts(30*time.Minute, 10)
+	if err != nil {
+		t.Fatalf("mark timeouts: %v", err)
+	}
+	if changed != 1 {
+		t.Fatalf("expected one timed out order, got %d", changed)
+	}
+	var order model.FulfillmentOrder
+	if err := db.First(&order, processing.ID).Error; err != nil {
+		t.Fatalf("query order: %v", err)
+	}
+	if order.FulfillmentStatus != model.FulfillmentStatusFailed || !strings.Contains(order.FailureReason, "履约超时") {
+		t.Fatalf("expected failed timeout order, got %+v", order)
+	}
+	if !strings.Contains(order.ResultData, `"timeout":true`) {
+		t.Fatalf("timeout result_data should be recorded, got %s", order.ResultData)
+	}
+}
+
+func TestMarkProcessingTimeoutsSkipsRecentOrders(t *testing.T) {
+	db := newServiceTestDB(t)
+	merchantID, product := seedFulfillmentMerchant(t, db, "merchant-timeout-skip", 1000, -1, 100)
+	svc := NewFulfillmentService(db, nil)
+	created, err := svc.CreateOrder(CreateFulfillmentOrderInput{
+		MerchantID:    merchantID,
+		APIClientID:   13,
+		ClientOrderNo: "client-timeout-skip",
+		SKU:           product.SKU,
+	})
+	if err != nil {
+		t.Fatalf("create order: %v", err)
+	}
+	processing, err := svc.UpdateFulfillment(FulfillmentUpdateInput{
+		MerchantID:  merchantID,
+		APIClientID: 13,
+		OrderNo:     created.Order.OrderNo,
+		Status:      model.FulfillmentStatusProcessing,
+	})
+	if err != nil {
+		t.Fatalf("mark processing: %v", err)
+	}
+	changed, err := svc.MarkProcessingTimeouts(30*time.Minute, 10)
+	if err != nil {
+		t.Fatalf("mark timeouts: %v", err)
+	}
+	if changed != 0 {
+		t.Fatalf("recent processing order should not time out, got %d", changed)
+	}
+	var order model.FulfillmentOrder
+	if err := db.First(&order, processing.ID).Error; err != nil {
+		t.Fatalf("query order: %v", err)
+	}
+	if order.FulfillmentStatus != model.FulfillmentStatusProcessing {
+		t.Fatalf("expected processing order, got %+v", order)
+	}
+}
+
 func TestFulfillmentMerchantIsolation(t *testing.T) {
 	db := newServiceTestDB(t)
 	merchantA, productA := seedFulfillmentMerchant(t, db, "merchant-d", 1000, 1, 100)