hy/yumi-golang
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

经理中心

Browse Source
This commit is contained in:
hy001 2026-06-24 15:39:42 +08:00
parent 53c6f361f9
commit 4bb8613570
4 changed files with 86 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
internal/service/managercenter/service.go
View File

@ -15,17 +15,18 @@ import (
) )
type teamManagerInfoRow struct { type teamManagerInfoRow struct {
ID int64 `gorm:"column:id;primaryKey"` ID int64 `gorm:"column:id;primaryKey"`
UserID int64 `gorm:"column:user_id"` UserID int64 `gorm:"column:user_id"`
Origin string `gorm:"column:sys_origin"` Origin string `gorm:"column:sys_origin"`
Contact string `gorm:"column:contact"` Contact string `gorm:"column:contact"`
RegionID string `gorm:"column:region_id"` RegionID string `gorm:"column:region_id"`
CanAddBDLeader *bool `gorm:"column:can_add_bd_leader"` CanAddBDLeader *bool `gorm:"column:can_add_bd_leader"`
CanGiftProps *bool `gorm:"column:can_gift_props"` CanGiftProps *bool `gorm:"column:can_gift_props"`
CanBanUser *bool `gorm:"column:can_ban_user"` CanBanUser *bool `gorm:"column:can_ban_user"`
CanUnbanUser *bool `gorm:"column:can_unban_user"` CanUnbanUser *bool `gorm:"column:can_unban_user"`
CreateUser int64 `gorm:"column:create_user"` CanChangeCountry *bool `gorm:"column:can_change_country"`
UpdateUser int64 `gorm:"column:update_user"` CreateUser int64 `gorm:"column:create_user"`
UpdateUser int64 `gorm:"column:update_user"`
} }
func (teamManagerInfoRow) TableName() string { func (teamManagerInfoRow) TableName() string {
@ -378,9 +379,9 @@ func (s *Service) UnbanUser(ctx context.Context, user AuthUser, req UnbanUserReq
}, nil }, nil
} }
// ChangeUserCountry 只允许经理移动普通用户国家；用户已有业务身份时拒绝，避免跨国家后团队、币商和主播归属数据不一致。 // ChangeUserCountry 只允许 admin 开启改国家权限的经理移动普通用户国家；目标用户已有业务身份时拒绝，避免跨国家后团队、币商和主播归属数据不一致。
func (s *Service) ChangeUserCountry(ctx context.Context, user AuthUser, req ChangeUserCountryRequest) (*ChangeUserCountryResponse, error) { func (s *Service) ChangeUserCountry(ctx context.Context, user AuthUser, req ChangeUserCountryRequest) (*ChangeUserCountryResponse, error) {
if err := s.ensureManager(ctx, user); err != nil { if _, err := s.requireManagerFeature(ctx, user, managerFeatureChangeCountry); err != nil {
return nil, err return nil, err
} }
if req.UserID.Int64() <= 0 { if req.UserID.Int64() <= 0 {
@ -459,10 +460,11 @@ func (s *Service) requireManagerFeature(ctx context.Context, user AuthUser, feat
func managerFeaturesFromRow(row teamManagerInfoRow) ManagerFeatures { func managerFeaturesFromRow(row teamManagerInfoRow) ManagerFeatures {
return ManagerFeatures{ return ManagerFeatures{
AddBDLeader: defaultEnabled(row.CanAddBDLeader), AddBDLeader: defaultEnabled(row.CanAddBDLeader),
GiftProps: defaultEnabled(row.CanGiftProps), GiftProps: defaultEnabled(row.CanGiftProps),
BanUser: defaultEnabled(row.CanBanUser), BanUser: defaultEnabled(row.CanBanUser),
UnbanUser: defaultEnabled(row.CanUnbanUser), UnbanUser: defaultEnabled(row.CanUnbanUser),
ChangeCountry: defaultEnabled(row.CanChangeCountry),
} }
} }
@ -480,6 +482,8 @@ func (features ManagerFeatures) enabled(feature managerFeature) bool {
return features.BanUser return features.BanUser
case managerFeatureUnbanUser: case managerFeatureUnbanUser:
return features.UnbanUser return features.UnbanUser
case managerFeatureChangeCountry:
return features.ChangeCountry
default: default:
return false return false
} }

56
internal/service/managercenter/service_test.go
View File

@ -180,10 +180,11 @@ func TestGetProfileReturnsManagerFeatures(t *testing.T) {
service, _ := newManagerCenterTestService(t) service, _ := newManagerCenterTestService(t)
db := service.db.(*gorm.DB) db := service.db.(*gorm.DB)
seedManagerWithFeatures(t, db, 1, ManagerFeatures{ seedManagerWithFeatures(t, db, 1, ManagerFeatures{
AddBDLeader: true, AddBDLeader: true,
GiftProps: false, GiftProps: false,
BanUser: true, BanUser: true,
UnbanUser: false, UnbanUser: false,
ChangeCountry: true,
}) })
seedUsers(t, db, userBaseInfoRow{ID: 1, Account: "1"}) seedUsers(t, db, userBaseInfoRow{ID: 1, Account: "1"})
@ -191,7 +192,7 @@ func TestGetProfileReturnsManagerFeatures(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("GetProfile() error = %v", err) t.Fatalf("GetProfile() error = %v", err)
} }
if !resp.Features.AddBDLeader || resp.Features.GiftProps || !resp.Features.BanUser || resp.Features.UnbanUser { if !resp.Features.AddBDLeader || resp.Features.GiftProps || !resp.Features.BanUser || resp.Features.UnbanUser || !resp.Features.ChangeCountry {
t.Fatalf("features = %+v, want row switches returned", resp.Features) t.Fatalf("features = %+v, want row switches returned", resp.Features)
} }
} }
@ -793,6 +794,25 @@ func TestChangeUserCountryUpdatesCountryAndClearsCache(t *testing.T) {
} }
} }
func TestChangeUserCountryRejectsDisabledFeature(t *testing.T) {
service, _ := newManagerCenterTestService(t)
db := service.db.(*gorm.DB)
seedManagerWithFeatures(t, db, 1, ManagerFeatures{AddBDLeader: true, GiftProps: true, BanUser: true, UnbanUser: true})
seedUsers(t, db, userBaseInfoRow{ID: 2, Account: "2", CountryID: 10, CountryCode: "SA", CountryName: "Saudi Arabia"})
seedCountries(t, db, sysCountryCodeRow{ID: 11, AlphaTwo: "AE", CountryName: "United Arab Emirates", Open: true})
_, err := service.ChangeUserCountry(context.Background(), AuthUser{UserID: 1}, ChangeUserCountryRequest{UserID: ID(2), CountryID: ID(11)})
assertAppErrorCode(t, err, "manager_feature_disabled")
var row userBaseInfoRow
if err := db.Where("id = ?", int64(2)).First(&row).Error; err != nil {
t.Fatalf("load user: %v", err)
}
if row.CountryID != 10 || row.CountryCode != "SA" {
t.Fatalf("user row = %+v, want unchanged country when feature disabled", row)
}
}
func TestChangeUserCountryRejectsHistoryIdentity(t *testing.T) { func TestChangeUserCountryRejectsHistoryIdentity(t *testing.T) {
service, _ := newManagerCenterTestService(t) service, _ := newManagerCenterTestService(t)
db := service.db.(*gorm.DB) db := service.db.(*gorm.DB)
@ -867,24 +887,26 @@ func newManagerCenterTestService(t *testing.T) (*Service, *fakeManagerGateway) {
func seedManager(t *testing.T, db *gorm.DB, userID int64) { func seedManager(t *testing.T, db *gorm.DB, userID int64) {
t.Helper() t.Helper()
seedManagerWithFeatures(t, db, userID, ManagerFeatures{ seedManagerWithFeatures(t, db, userID, ManagerFeatures{
AddBDLeader: true, AddBDLeader: true,
GiftProps: true, GiftProps: true,
BanUser: true, BanUser: true,
UnbanUser: true, UnbanUser: true,
ChangeCountry: true,
}) })
} }
func seedManagerWithFeatures(t *testing.T, db *gorm.DB, userID int64, features ManagerFeatures) { func seedManagerWithFeatures(t *testing.T, db *gorm.DB, userID int64, features ManagerFeatures) {
t.Helper() t.Helper()
if err := db.Create(&teamManagerInfoRow{ if err := db.Create(&teamManagerInfoRow{
ID: userID, ID: userID,
UserID: userID, UserID: userID,
Origin: "LIKEI", Origin: "LIKEI",
RegionID: "SA", RegionID: "SA",
CanAddBDLeader: boolPtr(features.AddBDLeader), CanAddBDLeader: boolPtr(features.AddBDLeader),
CanGiftProps: boolPtr(features.GiftProps), CanGiftProps: boolPtr(features.GiftProps),
CanBanUser: boolPtr(features.BanUser), CanBanUser: boolPtr(features.BanUser),
CanUnbanUser: boolPtr(features.UnbanUser), CanUnbanUser: boolPtr(features.UnbanUser),
CanChangeCountry: boolPtr(features.ChangeCountry),
}).Error; err != nil { }).Error; err != nil {
t.Fatalf("seed manager: %v", err) t.Fatalf("seed manager: %v", err)
} }

18
internal/service/managercenter/types.go
View File

@ -41,10 +41,11 @@ const (
type managerFeature string type managerFeature string
const ( const (
managerFeatureAddBDLeader managerFeature = "add_bd_leader" managerFeatureAddBDLeader managerFeature = "add_bd_leader"
managerFeatureGiftProps managerFeature = "gift_props" managerFeatureGiftProps managerFeature = "gift_props"
managerFeatureBanUser managerFeature = "ban_user" managerFeatureBanUser managerFeature = "ban_user"
managerFeatureUnbanUser managerFeature = "unban_user" managerFeatureUnbanUser managerFeature = "unban_user"
managerFeatureChangeCountry managerFeature = "change_country"
) )
type AppError = common.AppError type AppError = common.AppError
@ -121,10 +122,11 @@ type ProfileResponse struct {
} }
type ManagerFeatures struct { type ManagerFeatures struct {
AddBDLeader bool `json:"addBdLeader"` AddBDLeader bool `json:"addBdLeader"`
GiftProps bool `json:"giftProps"` GiftProps bool `json:"giftProps"`
BanUser bool `json:"banUser"` BanUser bool `json:"banUser"`
UnbanUser bool `json:"unbanUser"` UnbanUser bool `json:"unbanUser"`
ChangeCountry bool `json:"changeCountry"`
} }
type UserSearchResponse struct { type UserSearchResponse struct {

16
migrations/055_team_manager_country_switch.sql Normal file
View File

@ -0,0 +1,16 @@
SET @table_schema = DATABASE();
SET @ddl = IF(
EXISTS(
SELECT 1
FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = @table_schema
AND TABLE_NAME = 'team_manager_base_info'
AND COLUMN_NAME = 'can_change_country'
),
'SELECT 1',
"ALTER TABLE `team_manager_base_info` ADD COLUMN `can_change_country` tinyint(1) NOT NULL DEFAULT 1 COMMENT '经理中心是否允许修改用户国家' AFTER `can_unban_user`"
);
PREPARE stmt FROM @ddl;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;