fix(distribution): 收紧分销权限与货架状态,开通时创建站点金库
无站点成员不再视为超管;分站下架只改展示状态;装修、批量加价与提现参数对齐。
This commit is contained in:
@@ -43,6 +43,8 @@ var (
|
||||
ErrLiveMoneyMovementFrozen = errors.New("distribution settlement and withdrawal frozen until split rules are verified")
|
||||
ErrTooManySyncListings = errors.New("too many listings to sync")
|
||||
ErrSyncListingNotFound = errors.New("sync listing not found")
|
||||
ErrEmptyListingIDs = errors.New("listing ids required")
|
||||
ErrInvalidListingStatus = errors.New("invalid listing status")
|
||||
)
|
||||
|
||||
const maxSyncListingIDs = 200
|
||||
@@ -65,43 +67,88 @@ func NewRepository(db *gorm.DB, redis ...*redis.Client) *Repository {
|
||||
return r
|
||||
}
|
||||
|
||||
func (r *Repository) hasGlobalDistributionAccess(ctx context.Context, adminID uint64) (bool, error) {
|
||||
if adminID == 0 {
|
||||
return true, nil
|
||||
}
|
||||
if r.db == nil {
|
||||
return false, nil
|
||||
}
|
||||
var n int64
|
||||
if err := r.db.WithContext(ctx).Table("roles").
|
||||
Joins("JOIN admin_user_roles aur ON aur.role_id = roles.id").
|
||||
Where("aur.admin_user_id = ? AND roles.code = ?", adminID, "super_admin").
|
||||
Count(&n).Error; err != nil {
|
||||
return false, err
|
||||
}
|
||||
if n > 0 {
|
||||
return true, nil
|
||||
}
|
||||
if err := r.db.WithContext(ctx).Table("permissions").
|
||||
Joins("JOIN role_permissions rp ON rp.permission_id = permissions.id").
|
||||
Joins("JOIN admin_user_roles aur ON aur.role_id = rp.role_id").
|
||||
Where("aur.admin_user_id = ? AND permissions.code = ?", adminID, "distribution:all_view").
|
||||
Count(&n).Error; err != nil {
|
||||
return false, err
|
||||
}
|
||||
return n > 0, nil
|
||||
}
|
||||
|
||||
func (r *Repository) listActiveMemberSiteIDs(ctx context.Context, adminID uint64) ([]uint64, error) {
|
||||
var members []model.DistributionSiteMember
|
||||
if err := r.db.WithContext(ctx).Where("admin_user_id = ? AND status = 'active'", adminID).Find(&members).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
ids := make([]uint64, 0, len(members))
|
||||
for _, member := range members {
|
||||
ids = append(ids, member.SiteID)
|
||||
}
|
||||
return ids, nil
|
||||
}
|
||||
|
||||
func (r *Repository) ScopeSiteID(ctx context.Context, adminID, requested uint64) (uint64, error) {
|
||||
if adminID == 0 {
|
||||
return requested, nil
|
||||
}
|
||||
var members []model.DistributionSiteMember
|
||||
if err := r.db.WithContext(ctx).Where("admin_user_id = ? AND status = 'active'", adminID).Find(&members).Error; err != nil {
|
||||
global, err := r.hasGlobalDistributionAccess(ctx, adminID)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
if len(members) == 0 {
|
||||
if global {
|
||||
return requested, nil
|
||||
}
|
||||
siteIDs, err := r.listActiveMemberSiteIDs(ctx, adminID)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
if len(siteIDs) == 0 {
|
||||
return 0, ErrSiteAccessDenied
|
||||
}
|
||||
if requested > 0 {
|
||||
for _, member := range members {
|
||||
if member.SiteID == requested {
|
||||
for _, siteID := range siteIDs {
|
||||
if siteID == requested {
|
||||
return requested, nil
|
||||
}
|
||||
}
|
||||
return 0, ErrSiteAccessDenied
|
||||
}
|
||||
if len(members) == 1 {
|
||||
return members[0].SiteID, nil
|
||||
if len(siteIDs) == 1 {
|
||||
return siteIDs[0], nil
|
||||
}
|
||||
return 0, nil
|
||||
}
|
||||
|
||||
// ensureSiteAccess 校验管理员可访问指定站点:
|
||||
// 无成员记录(超级管理员语义)放行,有成员记录则必须命中。
|
||||
// ensureSiteAccess 校验管理员可访问指定站点。
|
||||
// 仅超级管理员或持有 distribution:all_view 的账号可跨站;无成员记录不再视为超管。
|
||||
func (r *Repository) ensureSiteAccess(ctx context.Context, adminID, siteID uint64) error {
|
||||
if adminID == 0 {
|
||||
return nil
|
||||
}
|
||||
var count int64
|
||||
if err := r.db.WithContext(ctx).Model(&model.DistributionSiteMember{}).
|
||||
Where("admin_user_id = ? AND status = 'active'", adminID).Count(&count).Error; err != nil {
|
||||
global, err := r.hasGlobalDistributionAccess(ctx, adminID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if count == 0 {
|
||||
if global {
|
||||
return nil
|
||||
}
|
||||
if siteID == 0 {
|
||||
@@ -165,6 +212,9 @@ func (r *Repository) CreateSite(ctx context.Context, req CreateSiteRequest) (*Si
|
||||
if err := r.db.WithContext(ctx).Create(&row).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := wallet.EnsureAccountTx(r.db.WithContext(ctx), 0, row.ID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
item := siteDTO(row)
|
||||
return &item, nil
|
||||
}
|
||||
@@ -950,11 +1000,15 @@ func (r *Repository) LoginMember(ctx context.Context, username, password string)
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
global, err := r.hasGlobalDistributionAccess(ctx, admin.ID)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
dto := DistributionCurrentMemberDTO{
|
||||
AdminID: admin.ID,
|
||||
Username: admin.Username,
|
||||
Nickname: admin.Nickname,
|
||||
IsSuperadmin: len(members) == 0,
|
||||
IsSuperadmin: global,
|
||||
}
|
||||
if len(members) > 0 {
|
||||
var site model.DistributionSite
|
||||
@@ -972,7 +1026,7 @@ func (r *Repository) LoginMember(ctx context.Context, username, password string)
|
||||
_ = r.db.WithContext(ctx).Model(&admin).Update("last_login_at", now).Error
|
||||
|
||||
if r.redis != nil {
|
||||
if dto.IsSuperadmin {
|
||||
if global {
|
||||
raw, _ := json.Marshal([]string{"*"})
|
||||
_ = r.redis.Set(ctx, fmt.Sprintf("admin:perms:%d", admin.ID), string(raw), 2*time.Hour).Err()
|
||||
} else {
|
||||
@@ -1018,11 +1072,15 @@ func (r *Repository) GetMemberProfile(ctx context.Context, adminID uint64) (*Dis
|
||||
if err := r.db.WithContext(ctx).Where("admin_user_id = ? AND status = 'active'", adminID).Find(&members).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
global, err := r.hasGlobalDistributionAccess(ctx, adminID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
dto := DistributionCurrentMemberDTO{
|
||||
AdminID: admin.ID,
|
||||
Username: admin.Username,
|
||||
Nickname: admin.Nickname,
|
||||
IsSuperadmin: len(members) == 0,
|
||||
IsSuperadmin: global,
|
||||
}
|
||||
if len(members) > 0 {
|
||||
var site model.DistributionSite
|
||||
@@ -1144,6 +1202,9 @@ func (r *Repository) OnboardSite(ctx context.Context, req OnboardSiteRequest) (*
|
||||
if err := tx.Create(&rule).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
if err := wallet.EnsureAccountTx(tx, 0, site.ID); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
resp = OnboardSiteResponse{
|
||||
Site: siteDTO(site),
|
||||
@@ -1365,19 +1426,31 @@ func (r *Repository) UpdateSiteBranding(ctx context.Context, adminID, siteID uin
|
||||
}
|
||||
return nil, err
|
||||
}
|
||||
site.LogoURL = strings.TrimSpace(req.LogoURL)
|
||||
site.FaviconURL = strings.TrimSpace(req.FaviconURL)
|
||||
site.BannersJSON = strings.TrimSpace(req.BannersJSON)
|
||||
site.AnnouncementsJSON = strings.TrimSpace(req.AnnouncementsJSON)
|
||||
site.FooterInfoJSON = strings.TrimSpace(req.FooterInfoJSON)
|
||||
if err := r.db.WithContext(ctx).Model(&site).Updates(map[string]any{
|
||||
"logo_url": site.LogoURL,
|
||||
"favicon_url": site.FaviconURL,
|
||||
"banners_json": site.BannersJSON,
|
||||
"announcements_json": site.AnnouncementsJSON,
|
||||
"footer_info_json": site.FooterInfoJSON,
|
||||
}).Error; err != nil {
|
||||
return nil, err
|
||||
updates := map[string]any{}
|
||||
if req.LogoURL != nil {
|
||||
site.LogoURL = strings.TrimSpace(*req.LogoURL)
|
||||
updates["logo_url"] = site.LogoURL
|
||||
}
|
||||
if req.FaviconURL != nil {
|
||||
site.FaviconURL = strings.TrimSpace(*req.FaviconURL)
|
||||
updates["favicon_url"] = site.FaviconURL
|
||||
}
|
||||
if req.BannersJSON != nil {
|
||||
site.BannersJSON = strings.TrimSpace(*req.BannersJSON)
|
||||
updates["banners_json"] = site.BannersJSON
|
||||
}
|
||||
if req.AnnouncementsJSON != nil {
|
||||
site.AnnouncementsJSON = strings.TrimSpace(*req.AnnouncementsJSON)
|
||||
updates["announcements_json"] = site.AnnouncementsJSON
|
||||
}
|
||||
if req.FooterInfoJSON != nil {
|
||||
site.FooterInfoJSON = strings.TrimSpace(*req.FooterInfoJSON)
|
||||
updates["footer_info_json"] = site.FooterInfoJSON
|
||||
}
|
||||
if len(updates) > 0 {
|
||||
if err := r.db.WithContext(ctx).Model(&site).Updates(updates).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
dto := siteDTO(site)
|
||||
return &dto, nil
|
||||
@@ -1422,11 +1495,12 @@ func (r *Repository) BatchUpdateAccountMarkup(ctx context.Context, adminID, site
|
||||
if req.MarkupAmountCent < 0 {
|
||||
return ErrInvalidAmount
|
||||
}
|
||||
query := r.db.WithContext(ctx).Model(&model.DistributionSiteAccount{}).Where("site_id = ?", siteID)
|
||||
if len(req.ListingIDs) > 0 {
|
||||
query = query.Where("listing_id IN (?)", req.ListingIDs)
|
||||
if len(req.ListingIDs) == 0 {
|
||||
return ErrEmptyListingIDs
|
||||
}
|
||||
return query.Update("markup_amount_cent", req.MarkupAmountCent).Error
|
||||
return r.db.WithContext(ctx).Model(&model.DistributionSiteAccount{}).
|
||||
Where("site_id = ? AND listing_id IN ?", siteID, req.ListingIDs).
|
||||
Update("markup_amount_cent", req.MarkupAmountCent).Error
|
||||
}
|
||||
|
||||
func (r *Repository) ListReceivedListings(ctx context.Context, adminID, siteID uint64, q ReceivedListingQuery) (*ReceivedListingPage, error) {
|
||||
@@ -1454,12 +1528,19 @@ func (r *Repository) ListReceivedListings(ctx context.Context, adminID, siteID u
|
||||
base := r.db.WithContext(ctx).Table("rental_listings rl").
|
||||
Joins("JOIN game_accounts ga ON ga.id = rl.account_id").
|
||||
Joins("LEFT JOIN users u ON u.id = rl.owner_id").
|
||||
Joins("LEFT JOIN distribution_site_accounts dsa ON dsa.listing_id = rl.id AND dsa.site_id = ?", siteID).
|
||||
Where("rl.distribution_site_id = ?", siteID)
|
||||
|
||||
if q.ReviewStatus != "" {
|
||||
base = base.Where("rl.review_status = ?", q.ReviewStatus)
|
||||
}
|
||||
if q.Status != "" {
|
||||
switch strings.TrimSpace(q.Status) {
|
||||
case "":
|
||||
case "offline", "disabled":
|
||||
base = base.Where("dsa.display_status = ?", "disabled")
|
||||
case "published", "enabled":
|
||||
base = base.Where("dsa.id IS NULL OR dsa.display_status = ?", "enabled")
|
||||
default:
|
||||
base = base.Where("rl.status = ?", q.Status)
|
||||
}
|
||||
if q.GameName != "" {
|
||||
@@ -1495,6 +1576,7 @@ func (r *Repository) ListReceivedListings(ctx context.Context, adminID, siteID u
|
||||
ReviewReason string `gorm:"column:review_reason"`
|
||||
InTransaction bool `gorm:"column:in_transaction"`
|
||||
DistributionSiteID uint64 `gorm:"column:distribution_site_id"`
|
||||
DisplayStatus string `gorm:"column:display_status"`
|
||||
CreatedAt time.Time `gorm:"column:created_at"`
|
||||
PublishedAt *time.Time `gorm:"column:published_at"`
|
||||
}
|
||||
@@ -1507,6 +1589,7 @@ func (r *Repository) ListReceivedListings(ctx context.Context, adminID, siteID u
|
||||
ga.game_name, ga.title, ga.server_region, ga.login_platform, ga.rank_level, ga.haf_coin_amount,
|
||||
rl.price_cent, rl.deposit_amount_cent, rl.status, rl.review_status, rl.review_reason,
|
||||
rl.in_transaction, COALESCE(rl.distribution_site_id, 0) AS distribution_site_id,
|
||||
COALESCE(dsa.display_status, 'enabled') AS display_status,
|
||||
rl.created_at, rl.published_at
|
||||
`
|
||||
if err := base.Select(selectSQL).Order("rl.id DESC").Offset((page - 1) * size).Limit(size).Scan(&rows).Error; err != nil {
|
||||
@@ -1519,6 +1602,10 @@ func (r *Repository) ListReceivedListings(ctx context.Context, adminID, siteID u
|
||||
if len(maskedPhone) >= 7 {
|
||||
maskedPhone = maskedPhone[:3] + "****" + maskedPhone[len(maskedPhone)-4:]
|
||||
}
|
||||
status := r.Status
|
||||
if r.DisplayStatus == "disabled" {
|
||||
status = "offline"
|
||||
}
|
||||
items = append(items, ReceivedListingDTO{
|
||||
ListingID: r.ID,
|
||||
ListingNo: r.ListingNo,
|
||||
@@ -1535,7 +1622,7 @@ func (r *Repository) ListReceivedListings(ctx context.Context, adminID, siteID u
|
||||
HafCoinAmount: r.HafCoinAmount,
|
||||
PriceCent: r.PriceCent,
|
||||
DepositAmountCent: r.DepositAmountCent,
|
||||
Status: r.Status,
|
||||
Status: status,
|
||||
ReviewStatus: r.ReviewStatus,
|
||||
ReviewReason: r.ReviewReason,
|
||||
PublishedAt: r.PublishedAt,
|
||||
@@ -1551,10 +1638,25 @@ func (r *Repository) ListReceivedListings(ctx context.Context, adminID, siteID u
|
||||
}, nil
|
||||
}
|
||||
|
||||
func receivedDisplayStatus(status string) (string, error) {
|
||||
switch strings.TrimSpace(status) {
|
||||
case "published", "enabled":
|
||||
return "enabled", nil
|
||||
case "offline", "disabled":
|
||||
return "disabled", nil
|
||||
default:
|
||||
return "", ErrInvalidListingStatus
|
||||
}
|
||||
}
|
||||
|
||||
func (r *Repository) UpdateReceivedListingStatus(ctx context.Context, adminID, listingID uint64, status string) error {
|
||||
if listingID == 0 {
|
||||
return errors.New("invalid listing id")
|
||||
}
|
||||
displayStatus, err := receivedDisplayStatus(status)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
var listing model.RentalListing
|
||||
if err := r.db.WithContext(ctx).First(&listing, listingID).Error; err != nil {
|
||||
return err
|
||||
@@ -1562,13 +1664,25 @@ func (r *Repository) UpdateReceivedListingStatus(ctx context.Context, adminID, l
|
||||
if listing.DistributionSiteID == nil || *listing.DistributionSiteID == 0 {
|
||||
return ErrSiteAccessDenied
|
||||
}
|
||||
if err := r.ensureSiteAccess(ctx, adminID, *listing.DistributionSiteID); err != nil {
|
||||
siteID := *listing.DistributionSiteID
|
||||
if err := r.ensureSiteAccess(ctx, adminID, siteID); err != nil {
|
||||
return err
|
||||
}
|
||||
if status != "published" && status != "inactive" && status != "closed" {
|
||||
return errors.New("invalid listing status")
|
||||
var row model.DistributionSiteAccount
|
||||
err = r.db.WithContext(ctx).Where("site_id = ? AND listing_id = ?", siteID, listing.ID).First(&row).Error
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
row = model.DistributionSiteAccount{
|
||||
SiteID: siteID,
|
||||
AccountID: listing.AccountID,
|
||||
ListingID: listing.ID,
|
||||
DisplayStatus: displayStatus,
|
||||
}
|
||||
return r.db.WithContext(ctx).Create(&row).Error
|
||||
}
|
||||
return r.db.WithContext(ctx).Model(&listing).Update("status", status).Error
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return r.db.WithContext(ctx).Model(&row).Update("display_status", displayStatus).Error
|
||||
}
|
||||
|
||||
func (r *Repository) GetSiteWallet(ctx context.Context, adminID, siteID uint64) (*SiteWalletDTO, error) {
|
||||
|
||||
Reference in New Issue
Block a user