BD-app_data

This commit is contained in:
2025-10-14 17:34:49 +08:00
parent 4a4fa681b6
commit 833953b39b

View File

@@ -108,7 +108,8 @@ public class BdGuildCenterService {
Users users = usersService.getUsersByUid(uid);
Integer partitionId = users.getPartitionId();
IPage<GuildInfoVo> page = new Page<>(pageNo, pageSize, false);
if (PartitionEnum.ENGLISH.getId() == partitionId) {
PartitionEnum partitionEnum = PartitionEnum.getByPartitionId(partitionId);
if (Constant.ClanMode.FAMILY.equals(partitionEnum.getClanMode())) {
page = familyMemberSerialService.listBdFamilyInfo(page, bdInfo.getId(), orderBy);
} else {
page = guildDiamondStatisticsDayService.listBdGuildInfo(page, bdInfo.getId(), orderBy);
@@ -120,7 +121,6 @@ public class BdGuildCenterService {
}
List<Long> ownerUids = records.stream().filter(x -> x.getOwnerUid()!=null).map(GuildInfoVo::getOwnerUid).collect(Collectors.toList());
Map<Long, Users> usersMapByUids = usersService.getUsersMapByUids(ownerUids);
PartitionEnum partitionEnum = PartitionEnum.getByPartitionId(partitionId);
for (GuildInfoVo record : records) {
if (record.getCreateTime() != null) {
record.setCreateTimeStr(DateTimeUtil.convertWithZoneId(record.getCreateTime(), partitionEnum.getZoneId())