公会-排行榜-去掉ss公会积分
This commit is contained in:
@@ -292,14 +292,14 @@ public class GuildManagerService {
|
||||
SimpleGuildOwnerVo simpleGuildOwnerVo = new SimpleGuildOwnerVo(targetUser, guild.getId(), guild.getName());
|
||||
|
||||
List<Integer> guildIds = Arrays.asList(simpleGuildOwnerVo.getGuildId());
|
||||
Map<Integer, GuildSSRankDetailVo> ssMarkMap = ssGuildService.getSSMarkByGuildId(targetUser.getPartitionId(), guildIds);
|
||||
//Map<Integer, GuildSSRankDetailVo> ssMarkMap = ssGuildService.getSSMarkByGuildId(targetUser.getPartitionId(), guildIds);
|
||||
Map<Integer, Integer> memberNumMap = guildService.getGuildMemberNumMapByGuildIds(guildIds);
|
||||
GuildSSRankDetailVo guildSSRankDetailVo = ssMarkMap.get(guild.getId());
|
||||
//GuildSSRankDetailVo guildSSRankDetailVo = ssMarkMap.get(guild.getId());
|
||||
simpleGuildOwnerVo.setMemberNumLimit(guild.getMemberNumLimit());
|
||||
if (guildSSRankDetailVo != null) {
|
||||
simpleGuildOwnerVo.setMarkScore(guildSSRankDetailVo.getMarkScore());
|
||||
simpleGuildOwnerVo.setSsLevel(guildSSRankDetailVo.getSsLevel());
|
||||
}
|
||||
//if (guildSSRankDetailVo != null) {
|
||||
// simpleGuildOwnerVo.setMarkScore(guildSSRankDetailVo.getMarkScore());
|
||||
// simpleGuildOwnerVo.setSsLevel(guildSSRankDetailVo.getSsLevel());
|
||||
//}
|
||||
Integer memberNum = memberNumMap.get(guild.getId());
|
||||
memberNum = memberNum == null ? 0 : memberNum;
|
||||
simpleGuildOwnerVo.setMemberNum(memberNum);
|
||||
@@ -498,7 +498,7 @@ public class GuildManagerService {
|
||||
guildList = guildList.subList(0, 10);
|
||||
}
|
||||
List<Integer> guildIds = guildList.stream().map(Guild::getId).collect(Collectors.toList());
|
||||
Map<Integer, GuildSSRankDetailVo> ssMarkMap = ssGuildService.getSSMarkByGuildId(partitionInfo.getId(), guildIds);
|
||||
//Map<Integer, GuildSSRankDetailVo> ssMarkMap = ssGuildService.getSSMarkByGuildId(partitionInfo.getId(), guildIds);
|
||||
Map<Integer, Integer> memberNumMap = guildService.getGuildMemberNumMapByGuildIds(guildIds);
|
||||
for (Guild guild: guildList){
|
||||
SimpleGuildVo vo = new SimpleGuildVo();
|
||||
@@ -509,11 +509,11 @@ public class GuildManagerService {
|
||||
vo.setOwner(ownerVo);
|
||||
|
||||
vo.setWeekIncome(weekIncomeMap.getOrDefault(guild.getId(), 0D));
|
||||
GuildSSRankDetailVo guildSSRankDetailVo = ssMarkMap.get(guild.getId());
|
||||
if (guildSSRankDetailVo != null) {
|
||||
vo.setMarkScore(guildSSRankDetailVo.getMarkScore());
|
||||
vo.setSsLevel(guildSSRankDetailVo.getSsLevel());
|
||||
}
|
||||
//GuildSSRankDetailVo guildSSRankDetailVo = ssMarkMap.get(guild.getId());
|
||||
//if (guildSSRankDetailVo != null) {
|
||||
// vo.setMarkScore(guildSSRankDetailVo.getMarkScore());
|
||||
// vo.setSsLevel(guildSSRankDetailVo.getSsLevel());
|
||||
//}
|
||||
Integer memberNum = memberNumMap.get(guild.getId());
|
||||
memberNum = memberNum == null ? 0 : memberNum;
|
||||
vo.setMemberNum(memberNum);
|
||||
|
Reference in New Issue
Block a user