diff --git a/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/cmd/team/manager/TeamManagerAddCmd.java b/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/cmd/team/manager/TeamManagerAddCmd.java index 09adf92c..29ea2c21 100644 --- a/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/cmd/team/manager/TeamManagerAddCmd.java +++ b/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/cmd/team/manager/TeamManagerAddCmd.java @@ -37,6 +37,8 @@ public class TeamManagerAddCmd extends Command { private Boolean canUnbanUser; + private Boolean canChangeCountry; + @NotNull(message = "createUser required.") private Long createUser; diff --git a/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/agency/manager/TeamManagerDTO.java b/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/agency/manager/TeamManagerDTO.java index ee1820b0..e7378e7f 100644 --- a/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/agency/manager/TeamManagerDTO.java +++ b/rc-service/rc-inner-api/other-inner/other-inner-model/src/main/java/com/red/circle/other/inner/model/dto/agency/manager/TeamManagerDTO.java @@ -40,6 +40,8 @@ public class TeamManagerDTO extends DTO { private Boolean canUnbanUser; + private Boolean canChangeCountry; + private Timestamp createTime; private Timestamp updateTime; diff --git a/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/team/manager/TeamManagerServiceImpl.java b/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/team/manager/TeamManagerServiceImpl.java index 90427932..c6b34e6e 100644 --- a/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/team/manager/TeamManagerServiceImpl.java +++ b/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/team/manager/TeamManagerServiceImpl.java @@ -96,6 +96,7 @@ public class TeamManagerServiceImpl implements TeamManagerService { .setCanGiftProps(defaultEnabled(info.getCanGiftProps())) .setCanBanUser(defaultEnabled(info.getCanBanUser())) .setCanUnbanUser(defaultEnabled(info.getCanUnbanUser())) + .setCanChangeCountry(defaultEnabled(info.getCanChangeCountry())) .setCreateTime(info.getCreateTime()) .setUpdateTime(info.getUpdateTime())); } @@ -120,6 +121,7 @@ public class TeamManagerServiceImpl implements TeamManagerService { .setCanGiftProps(defaultEnabled(cmd.getCanGiftProps())) .setCanBanUser(defaultEnabled(cmd.getCanBanUser())) .setCanUnbanUser(defaultEnabled(cmd.getCanUnbanUser())) + .setCanChangeCountry(defaultEnabled(cmd.getCanChangeCountry())) .setCreateUser(cmd.getCreateUser()); ResponseAssert.requiredSuccess(teamManagerClient.add(addCmd)); @@ -136,6 +138,7 @@ public class TeamManagerServiceImpl implements TeamManagerService { .setCanGiftProps(cmd.getCanGiftProps()) .setCanBanUser(cmd.getCanBanUser()) .setCanUnbanUser(cmd.getCanUnbanUser()) + .setCanChangeCountry(cmd.getCanChangeCountry()) .setUpdateUser(cmd.getUpdateUser()))); } diff --git a/rc-service/rc-service-console/console-client/src/main/java/com/red/circle/console/app/dto/clienobject/team/manager/TeamManagerCO.java b/rc-service/rc-service-console/console-client/src/main/java/com/red/circle/console/app/dto/clienobject/team/manager/TeamManagerCO.java index cc0aca12..c0124067 100644 --- a/rc-service/rc-service-console/console-client/src/main/java/com/red/circle/console/app/dto/clienobject/team/manager/TeamManagerCO.java +++ b/rc-service/rc-service-console/console-client/src/main/java/com/red/circle/console/app/dto/clienobject/team/manager/TeamManagerCO.java @@ -46,6 +46,8 @@ public class TeamManagerCO extends ClientObject { private Boolean canUnbanUser; + private Boolean canChangeCountry; + private Timestamp createTime; private Timestamp updateTime; diff --git a/rc-service/rc-service-console/console-client/src/main/java/com/red/circle/console/app/dto/cmd/app/team/manager/TeamManagerAddCmd.java b/rc-service/rc-service-console/console-client/src/main/java/com/red/circle/console/app/dto/cmd/app/team/manager/TeamManagerAddCmd.java index c44acf26..15fe47f2 100644 --- a/rc-service/rc-service-console/console-client/src/main/java/com/red/circle/console/app/dto/cmd/app/team/manager/TeamManagerAddCmd.java +++ b/rc-service/rc-service-console/console-client/src/main/java/com/red/circle/console/app/dto/cmd/app/team/manager/TeamManagerAddCmd.java @@ -39,4 +39,6 @@ public class TeamManagerAddCmd extends Command { private Boolean canUnbanUser; + private Boolean canChangeCountry; + } diff --git a/rc-service/rc-service-console/console-client/src/main/java/com/red/circle/console/app/dto/cmd/app/team/manager/TeamManagerUpdateCmd.java b/rc-service/rc-service-console/console-client/src/main/java/com/red/circle/console/app/dto/cmd/app/team/manager/TeamManagerUpdateCmd.java index 00fbb01f..bb64d7ce 100644 --- a/rc-service/rc-service-console/console-client/src/main/java/com/red/circle/console/app/dto/cmd/app/team/manager/TeamManagerUpdateCmd.java +++ b/rc-service/rc-service-console/console-client/src/main/java/com/red/circle/console/app/dto/cmd/app/team/manager/TeamManagerUpdateCmd.java @@ -37,4 +37,6 @@ public class TeamManagerUpdateCmd extends Command { private Boolean canUnbanUser; + private Boolean canChangeCountry; + } diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/entity/team/TeamManagerInfo.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/entity/team/TeamManagerInfo.java index c1752d40..72915c55 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/entity/team/TeamManagerInfo.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/entity/team/TeamManagerInfo.java @@ -75,4 +75,10 @@ public class TeamManagerInfo extends TimestampBaseEntity { @TableField("can_unban_user") private Boolean canUnbanUser; + /** + * 经理中心是否允许修改用户国家. + */ + @TableField("can_change_country") + private Boolean canChangeCountry; + } diff --git a/sql/20260624_team_manager_country_switch.sql b/sql/20260624_team_manager_country_switch.sql new file mode 100644 index 00000000..5b553fef --- /dev/null +++ b/sql/20260624_team_manager_country_switch.sql @@ -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;