From 6ff7692f3e3c4ddeeb77bfcbf9889f1cfbea7ff2 Mon Sep 17 00:00:00 2001 From: yml Date: Sun, 14 Jun 2026 09:42:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=A1=AE=E8=AE=A4=E5=BC=BA?= =?UTF-8?q?=E4=B8=80=E8=87=B4=E5=8C=96:=20=E8=AE=A2=E5=8D=95=E6=8E=A8?= =?UTF-8?q?=E8=BF=9B=E4=B8=8E=E6=A0=87=20paid=20=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E4=B8=BA=E5=8D=95=E4=BA=8B=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit confirmPaid 原为「先 ConfirmPaidFromChannel 独立事务推进订单, 再 Updates 标 paid」两步非原子, 崩溃在中间会出现订单已 pending_handoff 但 payment 仍 paying 的不一致窗口, 恢复依赖渠道回调重发而非事务闭环。 改造: - 新增 ConfirmPaidFromChannelTx(tx, orderID) 让 order 模块共享 payment 模块的外部事务, 订单推进与 payment 标 paid 落进同一事务, 崩溃一致性窗口消除 - NotifyNewConversation 提到事务提交后触发, 避免事务回滚后误发会话通知 - payment_orders 加行锁后 Updates, 防并发回调覆盖写 - 删除未使用的 providerBizNo 死参数 锁顺序全局一致 (order→listing→account→payment), 与 payment_start/refund/Cancel 路径无反向加锁, 无死锁风险。 新增集成测试: - 正向: 验证 confirmPaid 后 order/listing/account/payment 全部正确推进 - 回滚: payment 更新失败时 order 不残留 pending_handoff, 验证事务原子性 go build/vet/test 通过。 --- backend/internal/modules/order/lifecycle.go | 117 ++++++------ backend/internal/modules/order/repository.go | 6 + .../modules/payment/channel_status.go | 46 +++-- .../payment/repository_integration_test.go | 166 ++++++++++++++++++ 4 files changed, 270 insertions(+), 65 deletions(-) diff --git a/backend/internal/modules/order/lifecycle.go b/backend/internal/modules/order/lifecycle.go index 5af637e..245d9c1 100644 --- a/backend/internal/modules/order/lifecycle.go +++ b/backend/internal/modules/order/lifecycle.go @@ -136,61 +136,12 @@ func (r *Repository) Pay(ctx context.Context, userID uint64, orderID uint64) err func (r *Repository) ConfirmPaidFromChannel(ctx context.Context, orderID uint64, providerBizNo string) error { var newConvID uint64 err := r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error { - assets, err := r.lockOrderAssets(tx, orderID) + convID, err := r.ConfirmPaidFromChannelTx(tx, orderID) if err != nil { return err } - order := assets.Order - listing := assets.Listing - account := assets.Account - if order.Status == orderStatusPendingHandoff || order.Status == orderStatusRenting { - return nil - } - if order.Status != orderStatusPendingPayment { - return ErrOrderCannotPay - } - - if listing.Status != listingStatusPublished || listing.ReviewStatus != listingReviewStatusApproved || !listing.InTransaction { - return ErrListingUnavailable - } - - // 租客已通过外部渠道付款，这里不写租客钱包流水。 - orderID := order.ID - order.Status = orderStatusPendingHandoff - order.HandoffStatus = handoffStatusPendingOwner - markAssetsRented(listing, account) - conv, err := chat.EnsureOrderConversation(tx, *order) - if err != nil { - return err - } - newConvID = conv.ID - if err := notification.Append(tx, - notification.Entry{ - UserID: order.OwnerID, - Type: "order", - Title: "收到新的租号订单", - Content: "租客已完成支付，请尽快提交交接说明。", - BizType: "order", - BizID: &orderID, - }, - notification.Entry{ - UserID: order.RenterID, - Type: "order", - Title: "订单支付成功", - Content: "支付已完成，等待号主提交交接说明。", - BizType: "order", - BizID: &orderID, - }, - ); err != nil { - return err - } - if err := tx.Save(order).Error; err != nil { - return err - } - if err := tx.Save(listing).Error; err != nil { - return err - } - return tx.Save(account).Error + newConvID = convID + return nil }) if err != nil { return err @@ -201,6 +152,68 @@ func (r *Repository) ConfirmPaidFromChannel(ctx context.Context, orderID uint64, return nil } +// ConfirmPaidFromChannelTx 在外部事务内推进支付成功后的订单状态。 +// 调用方负责提交事务，并在提交成功后按返回的会话 ID 触发异步通知。 +func (r *Repository) ConfirmPaidFromChannelTx(tx *gorm.DB, orderID uint64) (uint64, error) { + assets, err := r.lockOrderAssets(tx, orderID) + if err != nil { + return 0, err + } + order := assets.Order + listing := assets.Listing + account := assets.Account + if order.Status == orderStatusPendingHandoff || order.Status == orderStatusRenting { + return 0, nil + } + if order.Status != orderStatusPendingPayment { + return 0, ErrOrderCannotPay + } + + if listing.Status != listingStatusPublished || listing.ReviewStatus != listingReviewStatusApproved || !listing.InTransaction { + return 0, ErrListingUnavailable + } + + // 租客已通过外部渠道付款，这里不写租客钱包流水。 + orderID = order.ID + order.Status = orderStatusPendingHandoff + order.HandoffStatus = handoffStatusPendingOwner + markAssetsRented(listing, account) + conv, err := chat.EnsureOrderConversation(tx, *order) + if err != nil { + return 0, err + } + if err := notification.Append(tx, + notification.Entry{ + UserID: order.OwnerID, + Type: "order", + Title: "收到新的租号订单", + Content: "租客已完成支付，请尽快提交交接说明。", + BizType: "order", + BizID: &orderID, + }, + notification.Entry{ + UserID: order.RenterID, + Type: "order", + Title: "订单支付成功", + Content: "支付已完成，等待号主提交交接说明。", + BizType: "order", + BizID: &orderID, + }, + ); err != nil { + return 0, err + } + if err := tx.Save(order).Error; err != nil { + return 0, err + } + if err := tx.Save(listing).Error; err != nil { + return 0, err + } + if err := tx.Save(account).Error; err != nil { + return 0, err + } + return conv.ID, nil +} + func (r *Repository) Cancel(ctx context.Context, userID uint64, orderID uint64) error { var refund *refundAction err := r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error { diff --git a/backend/internal/modules/order/repository.go b/backend/internal/modules/order/repository.go index f66f9fe..7b56ac8 100644 --- a/backend/internal/modules/order/repository.go +++ b/backend/internal/modules/order/repository.go @@ -49,3 +49,9 @@ func NewRepository(db *gorm.DB, deps ...Dependencies) *Repository { } return repo } + +func (r *Repository) NotifyNewConversation(conversationID uint64) { + if conversationID > 0 && r.chatNotifier != nil { + r.chatNotifier.NotifyNewConversation(conversationID) + } +} diff --git a/backend/internal/modules/payment/channel_status.go b/backend/internal/modules/payment/channel_status.go index de49c15..7e054fd 100644 --- a/backend/internal/modules/payment/channel_status.go +++ b/backend/internal/modules/payment/channel_status.go @@ -4,6 +4,9 @@ import ( "context" "hfb_sys/backend/internal/model" "time" + + "gorm.io/gorm" + "gorm.io/gorm/clause" ) func (r *Repository) applyChannelStatus(ctx context.Context, payment *model.PaymentOrder, status string, payTime string, raw map[string]string, source string) error { @@ -34,24 +37,41 @@ func (r *Repository) updateChannelStatus(ctx context.Context, paymentID uint64, return r.db.WithContext(ctx).Model(&model.PaymentOrder{}).Where("id = ?", paymentID).Updates(updates).Error } func (r *Repository) confirmPaid(ctx context.Context, payment *model.PaymentOrder, status string, paidAt time.Time, raw map[string]string, source string) error { - if payment.Status != "paid" && payment.OrderID != 0 { - if r.orderRepo == nil { - return ErrDependencyUnavailable + var newConvID uint64 + err := r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error { + if payment.OrderID != 0 { + if r.orderRepo == nil { + return ErrDependencyUnavailable + } + convID, err := r.orderRepo.ConfirmPaidFromChannelTx(tx, payment.OrderID) + if err != nil { + return err + } + newConvID = convID } - if err := r.orderRepo.ConfirmPaidFromChannel(ctx, payment.OrderID, firstNonEmpty(payment.ProviderOrderID, payment.PaymentNo)); err != nil { + + var latest model.PaymentOrder + if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).First(&latest, payment.ID).Error; err != nil { return err } + updates := map[string]any{ + "status": "paid", + "provider_order_id": firstNonEmpty(raw["provider_order_id"], raw["leshua_order_id"], raw["pay_order_no"], raw["trade_no"], latest.ProviderOrderID), + "raw_response": jsonMap(withRawSource(raw, source)), + "paid_at": paidAt, + } + if source == channelSourceNotify { + updates["notified_at"] = time.Now() + } + return tx.Model(&model.PaymentOrder{}).Where("id = ?", payment.ID).Updates(updates).Error + }) + if err != nil { + return err } - updates := map[string]any{ - "status": "paid", - "provider_order_id": firstNonEmpty(raw["provider_order_id"], raw["leshua_order_id"], raw["pay_order_no"], raw["trade_no"], payment.ProviderOrderID), - "raw_response": jsonMap(withRawSource(raw, source)), - "paid_at": paidAt, + if newConvID > 0 && r.orderRepo != nil { + r.orderRepo.NotifyNewConversation(newConvID) } - if source == channelSourceNotify { - updates["notified_at"] = time.Now() - } - return r.db.WithContext(ctx).Model(&model.PaymentOrder{}).Where("id = ?", payment.ID).Updates(updates).Error + return nil } func (r *Repository) markPaymentFailed(ctx context.Context, paymentID uint64, raw map[string]string, message string) error { if raw == nil { diff --git a/backend/internal/modules/payment/repository_integration_test.go b/backend/internal/modules/payment/repository_integration_test.go index 2f6f6f7..ca6d9db 100644 --- a/backend/internal/modules/payment/repository_integration_test.go +++ b/backend/internal/modules/payment/repository_integration_test.go @@ -2,8 +2,10 @@ package payment import ( "testing" + "time" "hfb_sys/backend/internal/model" + ordermodule "hfb_sys/backend/internal/modules/order" "gorm.io/driver/sqlite" "gorm.io/gorm" @@ -22,7 +24,13 @@ func setupPaymentTestDB(t *testing.T) *gorm.DB { if err := db.AutoMigrate( &model.PaymentOrder{}, &model.RentalOrder{}, + &model.RentalListing{}, + &model.GameAccount{}, &model.User{}, + &model.ChatConversation{}, + &model.ChatParticipant{}, + &model.ChatMessage{}, + &model.Notification{}, ); err != nil { t.Fatalf("数据库迁移失败: %v", err) } @@ -30,6 +38,82 @@ func setupPaymentTestDB(t *testing.T) *gorm.DB { return db } +type payableOrderFixture struct { + Owner model.User + Renter model.User + Account model.GameAccount + Listing model.RentalListing + Order model.RentalOrder + Payment model.PaymentOrder +} + +func createPayableOrderFixture(t *testing.T, db *gorm.DB, suffix string, createPayment bool) payableOrderFixture { + t.Helper() + f := payableOrderFixture{ + Owner: model.User{Phone: "13800001" + suffix}, + Renter: model.User{Phone: "13900001" + suffix}, + } + if err := db.Create(&f.Owner).Error; err != nil { + t.Fatalf("create owner failed: %v", err) + } + if err := db.Create(&f.Renter).Error; err != nil { + t.Fatalf("create renter failed: %v", err) + } + f.Account = model.GameAccount{ + OwnerID: f.Owner.ID, + ServerRegion: "国服", + LoginPlatform: "steam", + Title: "测试账号", + Status: "published", + } + if err := db.Create(&f.Account).Error; err != nil { + t.Fatalf("create account failed: %v", err) + } + f.Listing = model.RentalListing{ + ListingNo: "LST20260614" + suffix, + OwnerID: f.Owner.ID, + AccountID: f.Account.ID, + Status: "published", + ReviewStatus: "approved", + InTransaction: true, + PriceCent: 1000, + } + if err := db.Create(&f.Listing).Error; err != nil { + t.Fatalf("create listing failed: %v", err) + } + f.Order = model.RentalOrder{ + OrderNo: "ORD20260614" + suffix, + ListingID: f.Listing.ID, + AccountID: f.Account.ID, + OwnerID: f.Owner.ID, + RenterID: f.Renter.ID, + RentAmountCent: 1000, + Status: "pending_payment", + HandoffStatus: "none", + } + if err := db.Create(&f.Order).Error; err != nil { + t.Fatalf("create order failed: %v", err) + } + f.Payment = model.PaymentOrder{ + PaymentNo: "PAY20260614" + suffix, + OrderID: f.Order.ID, + OrderNo: f.Order.OrderNo, + UserID: f.Renter.ID, + Provider: "mock", + ThirdOrderID: "PAY20260614" + suffix, + ProviderOrderID: "MOCKPAY20260614" + suffix, + AmountCent: 1000, + BizType: "order_pay", + Status: "paying", + } + if createPayment { + if err := db.Create(&f.Payment).Error; err != nil { + t.Fatalf("create payment failed: %v", err) + } + } + return f +} + // TestCanReusePaymentWithSameProvider 测试相同渠道可复用 func TestCanReusePaymentWithSameProvider(t *testing.T) { payment := model.PaymentOrder{ @@ -346,3 +430,85 @@ func TestStartRefundDoesNotCreateNewOrderWhenFailedRefundExists(t *testing.T) { t.Fatalf("refund order count = %d, want 1", count) } } + +func TestConfirmPaidUpdatesOrderAndPaymentInOnePath(t *testing.T) { + db := setupPaymentTestDB(t) + orderRepo := ordermodule.NewRepository(db) + repo := NewRepository(db, nil, orderRepo) + fixture := createPayableOrderFixture(t, db, "0010", true) + + paidAt := time.Date(2026, 6, 14, 12, 0, 0, 0, time.UTC) + err := repo.confirmPaid(t.Context(), &fixture.Payment, "paid", paidAt, map[string]string{ + "provider_order_id": "PROVIDER202606140010", + }, channelSourceNotify) + if err != nil { + t.Fatalf("confirmPaid() error = %v", err) + } + + var latestPayment model.PaymentOrder + if err := db.First(&latestPayment, fixture.Payment.ID).Error; err != nil { + t.Fatalf("find payment failed: %v", err) + } + if latestPayment.Status != "paid" { + t.Fatalf("payment status = %q, want paid", latestPayment.Status) + } + if latestPayment.ProviderOrderID != "PROVIDER202606140010" { + t.Fatalf("provider order id = %q, want provider response", latestPayment.ProviderOrderID) + } + + var latestOrder model.RentalOrder + if err := db.First(&latestOrder, fixture.Order.ID).Error; err != nil { + t.Fatalf("find order failed: %v", err) + } + if latestOrder.Status != "pending_handoff" || latestOrder.HandoffStatus != "pending_owner" { + t.Fatalf("order status = %q/%q, want pending_handoff/pending_owner", latestOrder.Status, latestOrder.HandoffStatus) + } + + var latestListing model.RentalListing + if err := db.First(&latestListing, fixture.Listing.ID).Error; err != nil { + t.Fatalf("find listing failed: %v", err) + } + var latestAccount model.GameAccount + if err := db.First(&latestAccount, fixture.Account.ID).Error; err != nil { + t.Fatalf("find account failed: %v", err) + } + if latestListing.Status != "rented" || latestAccount.Status != "rented" { + t.Fatalf("asset status = %q/%q, want rented/rented", latestListing.Status, latestAccount.Status) + } +} + +func TestConfirmPaidRollsBackOrderWhenPaymentUpdateFails(t *testing.T) { + db := setupPaymentTestDB(t) + orderRepo := ordermodule.NewRepository(db) + repo := NewRepository(db, nil, orderRepo) + fixture := createPayableOrderFixture(t, db, "0011", false) + fixture.Payment.ID = 999999 + + paidAt := time.Date(2026, 6, 14, 12, 0, 0, 0, time.UTC) + err := repo.confirmPaid(t.Context(), &fixture.Payment, "paid", paidAt, map[string]string{ + "provider_order_id": "PROVIDER202606140011", + }, channelSourceNotify) + if err == nil { + t.Fatal("confirmPaid() error = nil, want payment lookup failure") + } + + var latestOrder model.RentalOrder + if findErr := db.First(&latestOrder, fixture.Order.ID).Error; findErr != nil { + t.Fatalf("find order failed: %v", findErr) + } + if latestOrder.Status != "pending_payment" || latestOrder.HandoffStatus != "none" { + t.Fatalf("order status = %q/%q, want rollback to pending_payment/none", latestOrder.Status, latestOrder.HandoffStatus) + } + + var latestListing model.RentalListing + if findErr := db.First(&latestListing, fixture.Listing.ID).Error; findErr != nil { + t.Fatalf("find listing failed: %v", findErr) + } + var latestAccount model.GameAccount + if findErr := db.First(&latestAccount, fixture.Account.ID).Error; findErr != nil { + t.Fatalf("find account failed: %v", findErr) + } + if latestListing.Status != "published" || latestAccount.Status != "published" { + t.Fatalf("asset status = %q/%q, want rollback to published/published", latestListing.Status, latestAccount.Status) + } +}