feat(tenant): 隔离客服通知文件与后台任务
This commit is contained in:
@@ -40,7 +40,7 @@ type conversationRow struct {
|
||||
}
|
||||
|
||||
func (r *Repository) conversationQuery(ctx context.Context, principal Principal) *gorm.DB {
|
||||
return r.db.WithContext(ctx).Table("chat_conversations AS c").
|
||||
query := r.db.WithContext(ctx).Table("chat_conversations AS c").
|
||||
Select(`c.id, c.order_id, c.listing_id, c.distribution_site_id, c.type, c.support_scene, c.title, c.status, c.last_message_id,
|
||||
c.last_message_preview, c.last_message_at, c.created_at, c.updated_at, cp.role,
|
||||
(
|
||||
@@ -53,6 +53,7 @@ func (r *Repository) conversationQuery(ctx context.Context, principal Principal)
|
||||
) AS unread_count`, principal.Type, principal.ID).
|
||||
Joins("JOIN chat_participants AS cp ON cp.conversation_id = c.id").
|
||||
Where("cp.participant_type = ? AND cp.participant_id = ?", principal.Type, principal.ID)
|
||||
return tenantConversationScope(ctx, query)
|
||||
}
|
||||
|
||||
func (r *Repository) CountUnreadMessages(ctx context.Context, principal Principal, siteCode ...string) (int64, error) {
|
||||
@@ -82,6 +83,7 @@ func (r *Repository) CountUnreadMessages(ctx context.Context, principal Principa
|
||||
filter, args := userSiteConversationFilter(siteID, principal.ID)
|
||||
query = query.Where(filter, args...)
|
||||
}
|
||||
query = tenantConversationScope(ctx, query)
|
||||
|
||||
var total int64
|
||||
err = query.Count(&total).Error
|
||||
@@ -360,12 +362,12 @@ func (row conversationRow) toDTO(participants []ParticipantDTO) ConversationDTO
|
||||
UpdatedAt: row.UpdatedAt,
|
||||
}
|
||||
}
|
||||
func defaultSupportAdminID(tx *gorm.DB) uint64 {
|
||||
if supportID := configuredDefaultSupportAdminID(tx); supportID > 0 {
|
||||
func defaultSupportAdminID(tx *gorm.DB, tenantID uint64) uint64 {
|
||||
if supportID := configuredDefaultSupportAdminID(tx, tenantID); supportID > 0 {
|
||||
return supportID
|
||||
}
|
||||
|
||||
adminIDs, err := supportAdminIDs(tx)
|
||||
adminIDs, err := supportAdminIDs(tx, tenantID)
|
||||
if err != nil || len(adminIDs) == 0 {
|
||||
return 0
|
||||
}
|
||||
@@ -402,33 +404,44 @@ func defaultSupportAdminID(tx *gorm.DB) uint64 {
|
||||
}
|
||||
return 0
|
||||
}
|
||||
func configuredDefaultSupportAdminID(tx *gorm.DB) uint64 {
|
||||
func configuredDefaultSupportAdminID(tx *gorm.DB, tenantID uint64) uint64 {
|
||||
var cfg model.SystemConfig
|
||||
if err := tx.Where("`key` = ?", "chat.default_support_admin_id").First(&cfg).Error; err == nil {
|
||||
query := tx.Where("`key` = ?", "chat.default_support_admin_id")
|
||||
if tenantID > 0 {
|
||||
query = query.Where("tenant_id = ?", tenantID)
|
||||
}
|
||||
if err := query.First(&cfg).Error; err == nil {
|
||||
id, parseErr := strconv.ParseUint(cfg.Value, 10, 64)
|
||||
if parseErr == nil && id > 0 && adminIsSupport(tx, id) {
|
||||
if parseErr == nil && id > 0 && adminIsSupport(tx, id, tenantID) {
|
||||
return id
|
||||
}
|
||||
}
|
||||
return 0
|
||||
}
|
||||
func supportAdminIDs(tx *gorm.DB) ([]uint64, error) {
|
||||
func supportAdminIDs(tx *gorm.DB, tenantID uint64) ([]uint64, error) {
|
||||
var adminIDs []uint64
|
||||
err := tx.Table("admin_users AS au").
|
||||
query := tx.Table("admin_users AS au").
|
||||
Joins("JOIN admin_user_roles AS aur ON aur.admin_user_id = au.id").
|
||||
Joins("JOIN roles AS r ON r.id = aur.role_id").
|
||||
Where("au.status = ? AND r.code = ?", "active", defaultSupportRoleCode).
|
||||
Where("au.status = ? AND r.code = ?", "active", defaultSupportRoleCode)
|
||||
if tenantID > 0 {
|
||||
query = query.Where("aur.tenant_id = ?", tenantID)
|
||||
}
|
||||
err := query.
|
||||
Order("CASE au.support_status WHEN 'online' THEN 0 WHEN 'busy' THEN 1 ELSE 2 END, au.id ASC").
|
||||
Pluck("au.id", &adminIDs).Error
|
||||
return adminIDs, err
|
||||
}
|
||||
func adminIsSupport(tx *gorm.DB, id uint64) bool {
|
||||
func adminIsSupport(tx *gorm.DB, id, tenantID uint64) bool {
|
||||
var count int64
|
||||
if err := tx.Table("admin_users AS au").
|
||||
query := tx.Table("admin_users AS au").
|
||||
Joins("JOIN admin_user_roles AS aur ON aur.admin_user_id = au.id").
|
||||
Joins("JOIN roles AS r ON r.id = aur.role_id").
|
||||
Where("au.id = ? AND au.status = ? AND r.code = ?", id, "active", defaultSupportRoleCode).
|
||||
Count(&count).Error; err != nil {
|
||||
Where("au.id = ? AND au.status = ? AND r.code = ?", id, "active", defaultSupportRoleCode)
|
||||
if tenantID > 0 {
|
||||
query = query.Where("aur.tenant_id = ?", tenantID)
|
||||
}
|
||||
if err := query.Count(&count).Error; err != nil {
|
||||
return false
|
||||
}
|
||||
return count > 0
|
||||
|
||||
Reference in New Issue
Block a user