yml/hfb_sys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

统一订单资产状态变更

Browse Source
This commit is contained in:
yml
2026-06-09 20:11:28 +08:00
parent 0990652f8b
commit 4c2199df58
5 changed files with 125 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/internal/modules/order/lifecycle.go
+16 -28
View File
@@ -78,7 +78,7 @@ func (r *Repository) Create(renterID uint64, req CreateRequest) (*OrderDTO, erro
); err != nil {
return err
}
listing.InTransaction = true
reserveListingForOrder(&listing)
if err := tx.Save(&listing).Error; err != nil {
return err
}
@@ -135,10 +135,13 @@ func (r *Repository) Pay(userID uint64, orderID uint64) error {
func (r *Repository) ConfirmPaidFromChannel(orderID uint64, providerBizNo string) error {
var newConvID uint64
err := r.db.Transaction(func(tx *gorm.DB) error {
var order model.RentalOrder
if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).First(&order, orderID).Error; err != nil {
assets, err := r.lockOrderAssets(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
}
@@ -146,25 +149,16 @@ func (r *Repository) ConfirmPaidFromChannel(orderID uint64, providerBizNo string
return ErrOrderCannotPay
}
var listing model.RentalListing
if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).First(&listing, order.ListingID).Error; err != nil {
return err
}
if listing.Status != listingStatusPublished || listing.ReviewStatus != listingReviewStatusApproved || !listing.InTransaction {
return ErrListingUnavailable
}
var account model.GameAccount
if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).First(&account, order.AccountID).Error; err != nil {
return err
}
// 租客已通过外部渠道付款，这里不写租客钱包流水。
orderID := order.ID
order.Status = orderStatusPendingHandoff
order.HandoffStatus = handoffStatusPendingOwner
listing.Status = listingStatusRented
account.Status = accountStatusRented
conv, err := chat.EnsureOrderConversation(tx, order)
markAssetsRented(listing, account)
conv, err := chat.EnsureOrderConversation(tx, *order)
if err != nil {
return err
}
@@ -189,13 +183,13 @@ func (r *Repository) ConfirmPaidFromChannel(orderID uint64, providerBizNo string
); err != nil {
return err
}
if err := tx.Save(&order).Error; err != nil {
if err := tx.Save(order).Error; err != nil {
return err
}
if err := tx.Save(&listing).Error; err != nil {
if err := tx.Save(listing).Error; err != nil {
return err
}
return tx.Save(&account).Error
return tx.Save(account).Error
})
if err != nil {
return err
@@ -218,12 +212,8 @@ func (r *Repository) Cancel(userID uint64, orderID uint64) error {
if order.Status != orderStatusPendingPayment && order.Status != orderStatusPendingHandoff {
return ErrOrderCannotCancel
}
var listing model.RentalListing
if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).First(&listing, order.ListingID).Error; err != nil {
return err
}
var account model.GameAccount
if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).First(&account, order.AccountID).Error; err != nil {
listing, account, err := r.lockListingAccountForOrder(tx, &order)
if err != nil {
return err
}
@@ -259,16 +249,14 @@ func (r *Repository) Cancel(userID uint64, orderID uint64) error {
); err != nil {
return err
}
listing.Status = listingStatusPublished
listing.InTransaction = false
account.Status = accountStatusPublished
releaseAssetsForRental(listing, account)
if err := tx.Save(&order).Error; err != nil {
return err
}
if err := tx.Save(&listing).Error; err != nil {
if err := tx.Save(listing).Error; err != nil {
return err
}
return tx.Save(&account).Error
return tx.Save(account).Error
})
if err != nil {
return err