合并 main 分支并融合订单列表最小化与 SQL 治理
- Auth/权限中间件取 main 演进版(错误细分、token 来源),保留 dev 的用户 cookie 与登出撤销语义 - 后台订单列表:融合 main 的首页免 COUNT 优化与关键词索引路由,保留 dev 的最小化 AdminOrderListItemDTO(结账明细仍由详情接口返回,同步调整对应集成测试) - 保留 dev 的 token_version 冻结/解冻递增与 main 的状态变化判断及通知 - 前端:保留 dev 登出接口与 main 的 fetchMe silent 参数、SSE 登录跳转;后台订单表按 dev 最小化 DTO 移除号主到手列
This commit is contained in:
@@ -21,7 +21,7 @@ func setupRefundRetryTestDB(t *testing.T) *gorm.DB {
|
||||
if err != nil {
|
||||
t.Fatalf("创建测试数据库失败: %v", err)
|
||||
}
|
||||
if err := db.AutoMigrate(&model.PaymentOrder{}, &model.RentalOrder{}); err != nil {
|
||||
if err := db.AutoMigrate(&model.PaymentOrder{}, &model.RentalOrder{}, &model.ChatConversation{}); err != nil {
|
||||
t.Fatalf("数据库迁移失败: %v", err)
|
||||
}
|
||||
return db
|
||||
@@ -161,23 +161,68 @@ func TestResetRetryClearsRetryFields(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestSyncRefundPaymentsMarksFailedAttemptForRetry(t *testing.T) {
|
||||
db := setupRefundRetryTestDB(t)
|
||||
repo := payment.NewRepository(db, nil, nil)
|
||||
job := New(db, nil, zap.NewNop(), repo)
|
||||
now := time.Date(2026, 9, 2, 12, 0, 0, 0, time.UTC)
|
||||
row := model.PaymentOrder{
|
||||
PaymentNo: "PAY-RETRY-FAIL",
|
||||
OrderID: 1,
|
||||
OrderNo: "ORD-RETRY-FAIL",
|
||||
UserID: 2,
|
||||
Provider: "lakala",
|
||||
MerchantID: "merchant-missing-config",
|
||||
ThirdOrderID: "REF-RETRY-FAIL",
|
||||
AmountCent: 1000,
|
||||
BizType: "admin_refund",
|
||||
Status: "refunding",
|
||||
UpdatedAt: now.Add(-10 * time.Minute),
|
||||
RetryCount: 1,
|
||||
}
|
||||
if err := db.Create(&row).Error; err != nil {
|
||||
t.Fatalf("create refund payment: %v", err)
|
||||
}
|
||||
|
||||
processed, err := job.syncRefundPayments(t.Context(), now)
|
||||
if err != nil {
|
||||
t.Fatalf("syncRefundPayments() error = %v", err)
|
||||
}
|
||||
if processed != 0 {
|
||||
t.Fatalf("processed = %d, want 0 when channel config is unavailable", processed)
|
||||
}
|
||||
var latest model.PaymentOrder
|
||||
if err := db.First(&latest, row.ID).Error; err != nil {
|
||||
t.Fatalf("find refund payment: %v", err)
|
||||
}
|
||||
if latest.RetryCount != 2 {
|
||||
t.Fatalf("retry_count = %d, want 2", latest.RetryCount)
|
||||
}
|
||||
if latest.LastRetryAt == nil || !latest.LastRetryAt.Equal(now) {
|
||||
t.Fatalf("last_retry_at = %v, want %v", latest.LastRetryAt, now)
|
||||
}
|
||||
if latest.NextRetryAt == nil || !latest.NextRetryAt.After(now) {
|
||||
t.Fatalf("next_retry_at = %v, want a future retry time", latest.NextRetryAt)
|
||||
}
|
||||
}
|
||||
|
||||
// createArbitrationOrphanFixture 构造一个仲裁孤儿订单:已支付原单 + 仲裁已结案但退款单缺失。
|
||||
func createArbitrationOrphanFixture(t *testing.T, db *gorm.DB, suffix string, settlementStatus string) model.RentalOrder {
|
||||
t.Helper()
|
||||
order := model.RentalOrder{
|
||||
OrderNo: "ORD" + suffix,
|
||||
ListingID: 1,
|
||||
AccountID: 1,
|
||||
OwnerID: 1,
|
||||
RenterID: 2,
|
||||
RentAmountCent: 1000,
|
||||
DepositAmountCent: 500,
|
||||
Status: "closed",
|
||||
HandoffStatus: "arbitrated",
|
||||
SettlementStatus: settlementStatus,
|
||||
RefundStatus: "pending",
|
||||
RefundAmountCent: 800,
|
||||
UpdatedAt: time.Now().Add(-20 * time.Minute), // 超过 10min 静默窗口
|
||||
OrderNo: "ORD" + suffix,
|
||||
ListingID: 1,
|
||||
AccountID: 1,
|
||||
OwnerID: 1,
|
||||
RenterID: 2,
|
||||
RentAmountCent: 1000,
|
||||
DepositAmountCent: 500,
|
||||
Status: "closed",
|
||||
HandoffStatus: "arbitrated",
|
||||
SettlementStatus: settlementStatus,
|
||||
RefundStatus: "pending",
|
||||
RefundAmountCent: 800,
|
||||
UpdatedAt: time.Now().Add(-20 * time.Minute), // 超过 10min 静默窗口
|
||||
}
|
||||
if err := db.Create(&order).Error; err != nil {
|
||||
t.Fatalf("create order failed: %v", err)
|
||||
|
||||
Reference in New Issue
Block a user