fix(listing-review): 按商品来源站点隔离审核

This commit is contained in:
yml
2026-11-15 19:50:08 +08:00
parent 0024b64dca
commit db7dbc7596
5 changed files with 115 additions and 16 deletions
+15 -9
View File
@@ -10,6 +10,7 @@ import (
"hfb_sys/backend/internal/model"
"hfb_sys/backend/internal/modules/notification"
smsnode "hfb_sys/backend/internal/modules/sms"
"hfb_sys/backend/internal/tenancy"
"gorm.io/datatypes"
"gorm.io/gorm"
@@ -18,7 +19,8 @@ import (
func (r *Repository) ListPendingReview(ctx context.Context) ([]ListingDTO, error) {
var rows []listingRow
err := r.baseQuery(ctx).
query := applyListingSourceTenantScope(ctx, r.baseQuery(ctx), "l")
err := query.
Where("l.review_status = ? AND l.status <> ?", "pending", "offline").
Order("l.updated_at ASC, l.id ASC").
Limit(200).
@@ -40,7 +42,7 @@ func (r *Repository) AdminMarkAbnormal(ctx context.Context, adminID uint64, list
func (r *Repository) TransferOwner(ctx context.Context, adminID uint64, listingID uint64, req TransferOwnerRequest, meta AuditMeta) (*ListingDTO, error) {
var dto *ListingDTO
err := r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
listing, account, err := r.findForReviewUpdate(tx, listingID)
listing, account, err := r.findForReviewUpdate(ctx, tx, listingID)
if err != nil {
return err
}
@@ -53,8 +55,12 @@ func (r *Repository) TransferOwner(ctx context.Context, adminID uint64, listingI
}
var target model.User
if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).
Where("id = ? AND status = ? AND realname_status = ?", req.TargetUserID, "active", "verified").
targetQuery := tx.Clauses(clause.Locking{Strength: "UPDATE"}).
Where("id = ? AND status = ? AND realname_status = ?", req.TargetUserID, "active", "verified")
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
targetQuery = targetQuery.Where("tenant_id = ?", tenantID)
}
if err := targetQuery.
First(&target).Error; err != nil {
if IsNotFound(err) {
return ErrTargetOwnerInvalid
@@ -162,7 +168,7 @@ func emptyJSONListForListing() datatypes.JSON {
func (r *Repository) adminUpdateStatus(ctx context.Context, adminID uint64, listingID uint64, req AdminActionRequest, meta AuditMeta, listingStatus string, accountStatus string, action string, title string, content string) (*ListingDTO, error) {
var dto *ListingDTO
err := r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
listing, account, err := r.findForReviewUpdate(tx, listingID)
listing, account, err := r.findForReviewUpdate(ctx, tx, listingID)
if err != nil {
return err
}
@@ -228,7 +234,7 @@ func (r *Repository) adminUpdateStatus(ctx context.Context, adminID uint64, list
func (r *Repository) Approve(ctx context.Context, listingID uint64) (*ListingDTO, error) {
var dto *ListingDTO
err := r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
listing, account, err := r.findForReviewUpdate(tx, listingID)
listing, account, err := r.findForReviewUpdate(ctx, tx, listingID)
if err != nil {
return err
}
@@ -275,7 +281,7 @@ func (r *Repository) Approve(ctx context.Context, listingID uint64) (*ListingDTO
func (r *Repository) AdjustReviewPrice(ctx context.Context, adminID uint64, listingID uint64, req AdminPriceAdjustRequest, meta AuditMeta) (*ListingDTO, error) {
var dto *ListingDTO
err := r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
listing, account, err := r.findForReviewUpdate(tx, listingID)
listing, account, err := r.findForReviewUpdate(ctx, tx, listingID)
if err != nil {
return err
}
@@ -366,7 +372,7 @@ func (r *Repository) AdjustReviewPrice(ctx context.Context, adminID uint64, list
func (r *Repository) Reject(ctx context.Context, listingID uint64, req ReviewRequest) (*ListingDTO, error) {
var dto *ListingDTO
err := r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
listing, account, err := r.findForReviewUpdate(tx, listingID)
listing, account, err := r.findForReviewUpdate(ctx, tx, listingID)
if err != nil {
return err
}
@@ -414,7 +420,7 @@ func (r *Repository) Reject(ctx context.Context, listingID uint64, req ReviewReq
func (r *Repository) UpdateScreenshots(ctx context.Context, adminID uint64, listingID uint64, req AdminUpdateScreenshotsRequest, meta AuditMeta) (*ListingDTO, error) {
var dto *ListingDTO
err := r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
listing, account, err := r.findForReviewUpdate(tx, listingID)
listing, account, err := r.findForReviewUpdate(ctx, tx, listingID)
if err != nil {
return err
}