moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

公会单独绑定国家fixed

Browse Source
This commit is contained in:
hokli
2025-08-21 18:06:29 +08:00
parent cf7304f2cb
commit 69b3a5f465
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildApplyAdminService.java
View File

@@ -226,7 +226,7 @@ public class GuildApplyAdminService {
applyServiceById.setAdminId(admindId);
boolean b = guildApplyService.updateById(applyServiceById);
if (b) {
Integer guildId = guildManageAdminService.addGuildInfo(users, applyServiceById.getApplyTime(), admindId, null, null, applyServiceById.getInviteUid(), applyServiceById, null);
Integer guildId = guildManageAdminService.addGuildInfo(users, applyServiceById.getApplyTime(), admindId, null, null, applyServiceById.getInviteUid(), applyServiceById, null, null);
applyServiceById.setGuildId(guildId);
guildApplyService.updateById(applyServiceById);
String rejectSys = I18NMessageSourceUtil.getMessage(I18nAlertEnum.GUILD_APPLY_PASS, users.getPartitionId());

14
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildManageAdminService.java
View File

@@ -87,8 +87,7 @@ public class GuildManageAdminService {
@Transactional(rollbackFor = Exception.class)
public void createGuild(Long erbanNo, Integer adminId, String guildContactType, String guildContact,
Long inviteErbanNo,
Integer operatorId) {
Long inviteErbanNo, Integer operatorId, Integer regionId) {
Users u = usersService.getUserByErbanNo(erbanNo);
if (null == u){
throw new AdminServiceException(BusiStatus.USERNOTEXISTS);
@@ -124,7 +123,7 @@ public class GuildManageAdminService {
}
Date now = new Date();
int guildId = addGuildInfo(u, now, adminId, guildContactType, guildContact, inviteUid,null, operatorId);
int guildId = addGuildInfo(u, now, adminId, guildContactType, guildContact, inviteUid,null, operatorId, regionId);
guildOperatorHistoryAdminService.addGuildRef(guildId, u.getPartitionId(), operatorId, adminId);
}
@@ -140,9 +139,8 @@ public class GuildManageAdminService {
* @param operatorId
* @return
*/
public Integer addGuildInfo(Users u, Date now, Integer adminId,
String guildContactType, String guildContact,
Long inviteUid, GuildApply guildApply, Integer operatorId) {
public Integer addGuildInfo(Users u, Date now, Integer adminId, String guildContactType, String guildContact,
Long inviteUid, GuildApply guildApply, Integer operatorId, Integer regionId) {
Guild guild = new Guild();
guild.setPartitionId(u.getPartitionId());
guild.setOwnerUid(u.getUid());
@@ -169,7 +167,7 @@ public class GuildManageAdminService {
guild.setAvatar(u.getAvatar());
}
guild.setOperatorId(operatorId);
guild.setRegionId(u.getRegionId());
guild.setRegionId(regionId == null ? u.getRegionId() : regionId);
guildService.save(guild);
applicationContext.publishEvent(new NewGuildEvent(new NewGuildMessage(u.getPartitionId(), guild.getId(), u.getUid(), now)));
@@ -390,7 +388,7 @@ public class GuildManageAdminService {
vo.setOwnerErbanNo(u.getErbanNo());
vo.setOwnerNick(u.getNick());
vo.setOwnerPartitionName(partitionNameMap.get(u.getPartitionId()));
vo.setOwnerRegionName(regionNameMap.get(guild.getRegionId()));
vo.setOwnerRegionName(regionNameMap.get(u.getRegionId()));
}
vo.setPartitionId(guild.getPartitionId());
vo.setRegionId(guild.getRegionId());

4
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/guild/GuildManageAdminController.java
View File

@@ -50,12 +50,12 @@ public class GuildManageAdminController extends BaseController {
String guildContactType,
String guildContact,
Long inviteErbanNo,
Integer operatorId){
Integer operatorId, Integer regionId){
if (null == erbanNo){
throw new AdminServiceException(BusiStatus.PARAMERROR);
}
Integer adminId = getAdminId();
service.createGuild(erbanNo, adminId, guildContactType, guildContact, inviteErbanNo, operatorId);
service.createGuild(erbanNo, adminId, guildContactType, guildContact, inviteErbanNo, operatorId, regionId);
adminLogService.insertLog(adminId,getClass().getCanonicalName(),
"create guild","params===>>erbanNo:"+erbanNo);
return BusiResult.success();