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

Compare commits

merge into: moliparty:feature/20251017_diamondHour
Branches Tags
moliparty:master moliparty:dev moliparty:feature/20251017_diamondHour moliparty:feature/20251016_trSalary moliparty:moliparty moliparty:eparty_dev moliparty:eparty moliparty:jdk25_dev moliparty:feature/20250808_tr_guildSalary moliparty:feature/20250815_resource
...
pull from: moliparty:master
Branches Tags
moliparty:dev moliparty:feature/20251017_diamondHour moliparty:feature/20251016_trSalary moliparty:moliparty moliparty:master moliparty:eparty_dev moliparty:eparty moliparty:jdk25_dev moliparty:feature/20250808_tr_guildSalary moliparty:feature/20250815_resource

2 Commits
feature/20 ... master

Author SHA1 Message Date
hokli
4eb1d55b1b 公会列表bug 2025-10-20 14:56:09 +08:00
hokli
a4768691bb cdn链接 2025-10-20 10:59:25 +08:00
2 changed files with 2 additions and 5 deletions
Expand all files Collapse all files

2
accompany-base/accompany-core/src/main/java/com/accompany/common/constant/Constant.java
View File

@@ -1894,7 +1894,7 @@ public class Constant {
public static final Byte invalid = 0; //无效 public static final Byte invalid = 0; //无效
} }
public static String DEFAULT_DOMAIN = "https://img.molistar.xyz"; public static String DEFAULT_DOMAIN = "https://cdn.moliparty.com";
public static String DEFAULT_NICK = "Platform New User"; public static String DEFAULT_NICK = "Platform New User";
public static String DEFAULT_AVATAR = DEFAULT_DOMAIN + "/default_avatar_molistar.png"; public static String DEFAULT_AVATAR = DEFAULT_DOMAIN + "/default_avatar_molistar.png";
public static String DEFAULT_CAR = DEFAULT_DOMAIN + "/default_car.png"; public static String DEFAULT_CAR = DEFAULT_DOMAIN + "/default_car.png";

5
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildManagerService.java
View File

@@ -547,15 +547,12 @@ public class GuildManagerService {
Collections.shuffle(guildList); Collections.shuffle(guildList);
guildList = guildList.subList(0, 10); 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, Integer> memberNumMap = guildService.getGuildMemberNumMapByGuildIds(guildIds);
for (Guild guild: guildList){ for (Guild guild: guildList){
SimpleGuildVo vo = new SimpleGuildVo(); SimpleGuildVo vo = new SimpleGuildVo();
vo.setGuildId(guild.getId()); vo.setGuildId(guild.getId());
vo.setGuildName(guild.getName()); vo.setGuildName(guild.getName());
vo.setMemberNumLimit(guild.getMemberNumLimit()); vo.setMemberNumLimit(guild.getMemberNumLimit());
vo.setOwnerUid(guild.getOwnerUid());
vo.setWeekIncome(weekIncomeMap.getOrDefault(guild.getId(), 0D)); vo.setWeekIncome(weekIncomeMap.getOrDefault(guild.getId(), 0D));
voList.add(vo); voList.add(vo);
} }