feat(tenant): 隔离客服通知文件与后台任务

This commit is contained in:
yml
2026-11-15 16:23:28 +08:00
parent c7dacfa025
commit e994fd9166
52 changed files with 1670 additions and 254 deletions
@@ -7,6 +7,7 @@ import (
"time"
"hfb_sys/backend/internal/model"
"hfb_sys/backend/internal/tenancy"
"gorm.io/gorm"
)
@@ -48,6 +49,9 @@ func (r *Repository) ListSiteAnnouncements(ctx context.Context, adminID, siteID
}
base := r.db.WithContext(ctx).Model(&model.Announcement{}).Where("distribution_site_id = ?", siteID)
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
base = base.Where("tenant_id = ?", tenantID)
}
if s := strings.TrimSpace(status); s != "" {
base = base.Where("status = ?", s)
}
@@ -83,6 +87,7 @@ func (r *Repository) CreateSiteAnnouncement(ctx context.Context, adminID, siteID
}
createdBy := adminID
row := model.Announcement{
TenantID: tenancy.IDFromContext(ctx),
DistributionSiteID: siteID,
Title: strings.TrimSpace(req.Title),
Content: req.Content,
@@ -199,7 +204,11 @@ func (r *Repository) DeleteSiteAnnouncement(ctx context.Context, adminID, siteID
// findSiteAnnouncement 按站点归属读取公告,跨站 ID 一律视为不存在。
func (r *Repository) findSiteAnnouncement(ctx context.Context, siteID, id uint64) (*model.Announcement, error) {
var row model.Announcement
err := r.db.WithContext(ctx).Where("id = ? AND distribution_site_id = ?", id, siteID).First(&row).Error
query := r.db.WithContext(ctx).Where("id = ? AND distribution_site_id = ?", id, siteID)
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
query = query.Where("tenant_id = ?", tenantID)
}
err := query.First(&row).Error
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, ErrAnnouncementNotFound
@@ -17,6 +17,7 @@ import (
listingpkg "hfb_sys/backend/internal/modules/listing"
"hfb_sys/backend/internal/modules/systemconfig"
"hfb_sys/backend/internal/modules/wallet"
"hfb_sys/backend/internal/tenancy"
"hfb_sys/backend/pkg/crypto"
"github.com/redis/go-redis/v9"
@@ -422,7 +423,11 @@ func (r *Repository) resolveDefaultSettlementHoldDays(ctx context.Context) int {
return systemconfig.DefaultDistributionSettlementHoldDays
}
var row model.SystemConfig
if err := r.db.WithContext(ctx).Where("`key` = ?", systemconfig.DistributionSettlementHoldDaysKey).First(&row).Error; err != nil {
query := r.db.WithContext(ctx).Where("`key` = ?", systemconfig.DistributionSettlementHoldDaysKey)
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
query = query.Where("tenant_id = ?", tenantID)
}
if err := query.First(&row).Error; err != nil {
return systemconfig.DefaultDistributionSettlementHoldDays
}
return systemconfig.ParseDistributionSettlementHoldDays(row.Value)