fix(tenant): 收紧双站后台边界并补齐货架管理

This commit is contained in:
yml
2026-11-15 22:28:40 +08:00
parent a68eb815a9
commit 0cb385d84f
42 changed files with 831 additions and 97 deletions
@@ -80,13 +80,15 @@ func (r *Repository) Status(ctx context.Context, userID uint64) (*StatusDTO, err
return nil, err
}
var user model.User
if err := r.db.WithContext(ctx).First(&user, userID).Error; err != nil {
if err := loadQualityOwnerUser(ctx, r.db.WithContext(ctx), userID, false, &user); err != nil {
return nil, err
}
var account model.WalletAccount
walletErr := r.db.WithContext(ctx).
Where("user_id = ? AND distribution_site_id = 0", userID).
First(&account).Error
accountQuery := r.db.WithContext(ctx).Where("user_id = ? AND distribution_site_id = 0", userID)
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
accountQuery = accountQuery.Where("tenant_id = ?", tenantID)
}
walletErr := accountQuery.First(&account).Error
if walletErr != nil && !errors.Is(walletErr, gorm.ErrRecordNotFound) {
return nil, walletErr
}
@@ -107,7 +109,7 @@ func (r *Repository) PaymentAmount(ctx context.Context, userID uint64) (int64, b
return 0, false, ErrInvalidUser
}
var user model.User
if err := r.db.WithContext(ctx).First(&user, userID).Error; err != nil {
if err := loadQualityOwnerUser(ctx, r.db.WithContext(ctx), userID, false, &user); err != nil {
return 0, false, err
}
if user.QualityOwnerStatus == StatusActive {
@@ -130,8 +132,12 @@ func (r *Repository) ConfirmQualityOwnerDepositPaidTx(tx *gorm.DB, userID uint64
if tx == nil || userID == 0 || amountCent <= 0 || paymentNo == "" {
return ErrInvalidUser
}
ctx := tx.Statement.Context
if ctx == nil {
ctx = context.Background()
}
var user model.User
if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).First(&user, userID).Error; err != nil {
if err := loadQualityOwnerUser(ctx, tx, userID, true, &user); err != nil {
return err
}
var appliedCount int64
@@ -208,7 +214,7 @@ func (r *Repository) Activate(ctx context.Context, userID uint64) (*StatusDTO, e
}
err = r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
var user model.User
if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).First(&user, userID).Error; err != nil {
if err := loadQualityOwnerUser(ctx, tx, userID, true, &user); err != nil {
return err
}
if user.RealnameStatus != "verified" {
@@ -303,7 +309,7 @@ func (r *Repository) Cancel(ctx context.Context, userID uint64, meta AuditMeta)
}
err := r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
var user model.User
if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).First(&user, userID).Error; err != nil {
if err := loadQualityOwnerUser(ctx, tx, userID, true, &user); err != nil {
return err
}
if user.QualityOwnerStatus != StatusActive {
@@ -358,7 +364,7 @@ func (r *Repository) AdminSet(ctx context.Context, adminID uint64, userID uint64
}
err = r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
var user model.User
if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).First(&user, userID).Error; err != nil {
if err := loadQualityOwnerUser(ctx, tx, userID, true, &user); err != nil {
return err
}
beforeStatus := user.QualityOwnerStatus
@@ -414,6 +420,17 @@ func (r *Repository) AdminSet(ctx context.Context, adminID uint64, userID uint64
return r.Status(ctx, userID)
}
func loadQualityOwnerUser(ctx context.Context, db *gorm.DB, userID uint64, lock bool, user *model.User) error {
query := db.Model(&model.User{})
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
query = query.Where("tenant_id = ? AND distribution_site_id = 0", tenantID)
}
if lock {
query = query.Clauses(clause.Locking{Strength: "UPDATE"})
}
return query.First(user, userID).Error
}
func activePremiumListingCount(db *gorm.DB, userID uint64) (int64, error) {
var count int64
err := db.Model(&model.RentalListing{}).