公会-土耳其-公会主页-增加公会水晶余额
This commit is contained in:
@@ -53,4 +53,7 @@ public class GuildVo {
|
||||
@ApiModelProperty("退出按钮标识")
|
||||
private Boolean applyQuitButtonFlag = Boolean.FALSE;
|
||||
|
||||
@ApiModelProperty("公会紫晶余额")
|
||||
private Double guildCrystalNum;
|
||||
|
||||
}
|
||||
|
@@ -2,15 +2,18 @@ package com.accompany.business.service.guild;
|
||||
|
||||
import com.accompany.business.constant.guild.GuildConstant;
|
||||
import com.accompany.business.event.GuildMemberStatusChangeEvent;
|
||||
import com.accompany.business.model.UserPurse;
|
||||
import com.accompany.business.model.guild.Guild;
|
||||
import com.accompany.business.model.guild.GuildAuth;
|
||||
import com.accompany.business.model.guild.GuildMember;
|
||||
import com.accompany.business.model.guild.GuildOperateRecord;
|
||||
import com.accompany.business.service.level.LevelService;
|
||||
import com.accompany.business.service.netease.YidunCheckUtil;
|
||||
import com.accompany.business.service.purse.UserPurseService;
|
||||
import com.accompany.business.service.user.UsersService;
|
||||
import com.accompany.business.vo.SimpleUserVo;
|
||||
import com.accompany.business.vo.guild.*;
|
||||
import com.accompany.common.constant.Constant;
|
||||
import com.accompany.common.device.DeviceInfo;
|
||||
import com.accompany.common.redis.RedisKey;
|
||||
import com.accompany.common.status.BusiStatus;
|
||||
@@ -85,6 +88,8 @@ public class GuildManagerService {
|
||||
private BdGuildService bdGuildService;
|
||||
@Autowired
|
||||
private ApplicationContext applicationContext;
|
||||
@Autowired
|
||||
private UserPurseService userPurseService;
|
||||
|
||||
@SneakyThrows
|
||||
public GuildVo getGuildVo(Long uid) {
|
||||
@@ -118,14 +123,16 @@ public class GuildManagerService {
|
||||
vo.setRoleType(guildMember.getRoleType());
|
||||
|
||||
Users u = usersService.getNotNullUsersByUid(uid);
|
||||
vo.setPartitionId(u.getPartitionId());
|
||||
PartitionEnum partitionEnum = PartitionEnum.getByPartitionId(u.getPartitionId());
|
||||
vo.setPartitionId(partitionEnum.getId());
|
||||
vo.setApplyQuitButtonFlag(this.quitButtonCheckOpen(u.getPartitionId()));
|
||||
|
||||
CountDownLatch cdl = new CountDownLatch(3);
|
||||
bizExecutor.execute(()->{
|
||||
try {
|
||||
SimpleUserVo me = usersService.getSimpleUserVo(u);
|
||||
vo.setMe(me);
|
||||
PartitionEnum partitionEnum = PartitionEnum.getByPartitionId(u.getPartitionId());
|
||||
|
||||
List<String> guildAuthCodeList = guildAuthService.listAuthByRoleType(partitionEnum.getClanMode(), guildMember.getRoleType())
|
||||
.stream().map(GuildAuth::getCode).collect(Collectors.toList());
|
||||
vo.setAuthCodes(guildAuthCodeList);
|
||||
@@ -167,6 +174,11 @@ public class GuildManagerService {
|
||||
}
|
||||
});
|
||||
|
||||
if (Constant.ClanMode.GUILD_POLICY2.equals(partitionEnum.getClanMode())){
|
||||
UserPurse userPurse = userPurseService.queryUserPurse(uid);
|
||||
vo.setGuildCrystalNum(userPurse.getGuildCrystal());
|
||||
}
|
||||
|
||||
cdl.await(5, TimeUnit.SECONDS);
|
||||
|
||||
return vo;
|
||||
|
Reference in New Issue
Block a user