feat(tenant): 隔离客服通知文件与后台任务
This commit is contained in:
@@ -5,6 +5,7 @@ import (
|
||||
"strings"
|
||||
|
||||
"hfb_sys/backend/internal/model"
|
||||
"hfb_sys/backend/internal/tenancy"
|
||||
|
||||
"gorm.io/gorm"
|
||||
"gorm.io/gorm/clause"
|
||||
@@ -23,7 +24,11 @@ func (r *Repository) GetConfig(ctx context.Context) (*ConfigDTO, error) {
|
||||
}
|
||||
keys := []string{configKeyDefaultQrcodeURL, configKeyOrderCopyTemplate}
|
||||
var rows []model.SystemConfig
|
||||
if err := r.db.WithContext(ctx).Where("`key` IN ?", keys).Find(&rows).Error; err != nil {
|
||||
query := r.db.WithContext(ctx).Where("`key` IN ?", keys)
|
||||
if tenantID := tenancy.IDFromContext(ctx); tenantID > 0 {
|
||||
query = query.Where("tenant_id = ?", tenantID)
|
||||
}
|
||||
if err := query.Find(&rows).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
values := map[string]string{}
|
||||
@@ -60,13 +65,18 @@ func (r *Repository) UpdateConfig(ctx context.Context, req UpdateConfigRequest)
|
||||
}
|
||||
|
||||
func upsertConfig(tx *gorm.DB, key, value, description string) error {
|
||||
tenantID := uint64(0)
|
||||
if tx.Statement != nil && tx.Statement.Context != nil {
|
||||
tenantID = tenancy.IDFromContext(tx.Statement.Context)
|
||||
}
|
||||
row := model.SystemConfig{
|
||||
TenantID: tenantID,
|
||||
Key: key,
|
||||
Value: value,
|
||||
Description: description,
|
||||
}
|
||||
return tx.Clauses(clause.OnConflict{
|
||||
Columns: []clause.Column{{Name: "key"}},
|
||||
Columns: []clause.Column{{Name: "tenant_id"}, {Name: "key"}},
|
||||
DoUpdates: clause.AssignmentColumns([]string{"value", "description"}),
|
||||
}).Create(&row).Error
|
||||
}
|
||||
@@ -86,7 +96,13 @@ func (r *Repository) resolveQrcodeURL(tx *gorm.DB, productQrcode string) string
|
||||
return productQrcode
|
||||
}
|
||||
var cfg model.SystemConfig
|
||||
if err := tx.Where("`key` = ?", configKeyDefaultQrcodeURL).First(&cfg).Error; err == nil {
|
||||
query := tx.Where("`key` = ?", configKeyDefaultQrcodeURL)
|
||||
if tx.Statement != nil && tx.Statement.Context != nil {
|
||||
if tenantID := tenancy.IDFromContext(tx.Statement.Context); tenantID > 0 {
|
||||
query = query.Where("tenant_id = ?", tenantID)
|
||||
}
|
||||
}
|
||||
if err := query.First(&cfg).Error; err == nil {
|
||||
return strings.TrimSpace(cfg.Value)
|
||||
}
|
||||
return ""
|
||||
@@ -94,7 +110,13 @@ func (r *Repository) resolveQrcodeURL(tx *gorm.DB, productQrcode string) string
|
||||
|
||||
func (r *Repository) loadCopyTemplate(tx *gorm.DB) string {
|
||||
var cfg model.SystemConfig
|
||||
if err := tx.Where("`key` = ?", configKeyOrderCopyTemplate).First(&cfg).Error; err == nil && strings.TrimSpace(cfg.Value) != "" {
|
||||
query := tx.Where("`key` = ?", configKeyOrderCopyTemplate)
|
||||
if tx.Statement != nil && tx.Statement.Context != nil {
|
||||
if tenantID := tenancy.IDFromContext(tx.Statement.Context); tenantID > 0 {
|
||||
query = query.Where("tenant_id = ?", tenantID)
|
||||
}
|
||||
}
|
||||
if err := query.First(&cfg).Error; err == nil && strings.TrimSpace(cfg.Value) != "" {
|
||||
return strings.TrimSpace(cfg.Value)
|
||||
}
|
||||
return defaultOrderCopyTemplate
|
||||
|
||||
Reference in New Issue
Block a user