修复超时订单重置流程

2026-06-19 18:36:46 +08:00
parent 2df935f74c
commit 72285ed638
11 changed files with 449 additions and 46 deletions
@@ -23,6 +23,8 @@ func setupOrderTimeoutTestDB(t *testing.T) *gorm.DB {
 	}
 	if err := db.AutoMigrate(
 		&model.RentalOrder{},
+		&model.HandoffRecord{},
+		&model.Notification{},
 		&model.ChatConversation{},
 		&model.ChatParticipant{},
 		&model.ChatMessage{},
@@ -152,6 +154,101 @@ func TestHandleEndedOrderRenterRetention(t *testing.T) {
 	}
 }

+func TestHandleRenterConfirmTimeoutUsesRefreshedStageTime(t *testing.T) {
+	db := setupOrderTimeoutTestDB(t)
+	job := New(db, nil, zap.NewNop())
+	now := time.Date(2026, 6, 18, 12, 0, 0, 0, time.UTC)
+	oldHandoffAt := now.Add(-2 * time.Hour)
+	refreshedAt := now.Add(-5 * time.Minute)
+
+	order := model.RentalOrder{
+		OrderNo:          "ORDER-RENTER-CONFIRM-RESET",
+		ListingID:        101,
+		AccountID:        201,
+		OwnerID:          301,
+		RenterID:         401,
+		Status:           "pending_handoff",
+		HandoffStatus:    "pending_renter_confirm",
+		HandoffStartedAt: &refreshedAt,
+	}
+	if err := db.Create(&order).Error; err != nil {
+		t.Fatalf("创建订单失败: %v", err)
+	}
+	record := model.HandoffRecord{
+		OrderID:    order.ID,
+		FromUserID: order.OwnerID,
+		ToUserID:   order.RenterID,
+		Type:       "owner_handoff",
+		Content:    "交接说明",
+		CreatedAt:  oldHandoffAt,
+	}
+	if err := db.Create(&record).Error; err != nil {
+		t.Fatalf("创建交接记录失败: %v", err)
+	}
+
+	count, err := job.handleRenterConfirmTimeout(t.Context(), now, thresholds{
+		RenterConfirmTimeoutMinutes: 30,
+	})
+	if err != nil {
+		t.Fatalf("确认收号超时任务失败: %v", err)
+	}
+	if count != 0 {
+		t.Fatalf("处理数量 = %d, want 0", count)
+	}
+
+	var saved model.RentalOrder
+	if err := db.First(&saved, order.ID).Error; err != nil {
+		t.Fatalf("读取订单失败: %v", err)
+	}
+	if saved.Status != "pending_handoff" || saved.HandoffStatus != "pending_renter_confirm" {
+		t.Fatalf("订单状态 = %s/%s, want pending_handoff/pending_renter_confirm", saved.Status, saved.HandoffStatus)
+	}
+}
+
+func TestHandleOwnerReturnConfirmTimeoutUsesStageTime(t *testing.T) {
+	db := setupOrderTimeoutTestDB(t)
+	job := New(db, nil, zap.NewNop())
+	now := time.Date(2026, 6, 18, 12, 0, 0, 0, time.UTC)
+	oldUpdatedAt := now.Add(-2 * time.Hour)
+	refreshedAt := now.Add(-5 * time.Minute)
+
+	order := model.RentalOrder{
+		OrderNo:          "ORDER-CHECKOUT-CONFIRM-RESET",
+		ListingID:        102,
+		AccountID:        202,
+		OwnerID:          302,
+		RenterID:         402,
+		Status:           "pending_checkout_confirm",
+		HandoffStatus:    "pending_owner_checkout",
+		HandoffStartedAt: &refreshedAt,
+		UpdatedAt:        oldUpdatedAt,
+	}
+	if err := db.Create(&order).Error; err != nil {
+		t.Fatalf("创建订单失败: %v", err)
+	}
+	if err := db.Model(&model.RentalOrder{}).Where("id = ?", order.ID).Update("updated_at", oldUpdatedAt).Error; err != nil {
+		t.Fatalf("回写旧更新时间失败: %v", err)
+	}
+
+	count, err := job.handleOwnerReturnConfirmTimeout(t.Context(), now, thresholds{
+		OwnerReturnConfirmTimeoutMinutes: 30,
+	})
+	if err != nil {
+		t.Fatalf("号主确认结账超时任务失败: %v", err)
+	}
+	if count != 0 {
+		t.Fatalf("处理数量 = %d, want 0", count)
+	}
+
+	var saved model.RentalOrder
+	if err := db.First(&saved, order.ID).Error; err != nil {
+		t.Fatalf("读取订单失败: %v", err)
+	}
+	if saved.Status != "pending_checkout_confirm" || saved.HandoffStatus != "pending_owner_checkout" {
+		t.Fatalf("订单状态 = %s/%s, want pending_checkout_confirm/pending_owner_checkout", saved.Status, saved.HandoffStatus)
+	}
+}
+
 func TestClampRenterRetentionDays(t *testing.T) {
 	tests := []struct {
 		value int