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

BDadmin

Browse Source
This commit is contained in:
hokli
2025-09-29 15:51:36 +08:00
parent c8961081d3
commit d2e2654ecf
4 changed files with 48 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/BdInfoAdminService.java
View File

@@ -13,6 +13,7 @@ import com.accompany.business.service.family.FamilyGiftRecordService;
import com.accompany.business.service.guild.BdGuildService;
import com.accompany.business.service.guild.BdInfoService;
import com.accompany.business.service.guild.GuildDiamondStatisticsDayService;
import com.accompany.business.service.guildsoviet.GuildExtraDiamondDayService;
import com.accompany.business.service.invite.UserInviteFissionRecordService;
import com.accompany.business.service.user.UsersService;
import com.accompany.business.vo.guild.GuildInfoVo;
@@ -56,6 +57,8 @@ public class BdInfoAdminService {
private GuildDiamondStatisticsDayService guildDiamondStatisticsDayService;
@Autowired
private FamilyGiftRecordService familyGiftRecordService;
@Autowired
private GuildExtraDiamondDayService guildExtraDiamondDayService;
public final int BOUND_EXPIRE_LIMIT_DAY = 7;
@@ -134,6 +137,8 @@ public class BdInfoAdminService {
Map<Integer, Double> guildDiamondOrGoldMap;
if (PartitionEnum.ENGLISH.getId() == partitionId) {
guildDiamondOrGoldMap = familyGiftRecordService.mapByFamilyId(DateUtil.formatDateTime(beginTime), DateUtil.formatDateTime(endTime), guildIdList);
} else if (PartitionEnum.SOVIET.getId() == partitionId) {
guildDiamondOrGoldMap = guildExtraDiamondDayService.mapByStatDate(DateUtil.formatDate(beginTime), DateUtil.formatDate(endTime), partitionId, guildIdList);
} else {
guildDiamondOrGoldMap = guildDiamondStatisticsDayService.mapByStatDate(DateUtil.formatDate(beginTime), DateUtil.formatDate(endTime), partitionId, guildIdList);
}
@@ -355,6 +360,16 @@ public class BdInfoAdminService {
record.setGoldNum(BigDecimal.valueOf(guildDiamondMap.getOrDefault(record.getGuildId(), 0D)));
}
}
} else if (PartitionEnum.SOVIET.getId() == users.getPartitionId()) {
guilds = bdGuildService.guildsByBdId(bdId, pageNo, pageSize);
List<GuildInfoVo> records = guilds.getRecords();
if (records != null) {
List<Integer> guildIds = records.stream().map(x -> x.getGuildId().intValue()).collect(Collectors.toList());
Map<Integer, Double> guildDiamondMap = guildExtraDiamondDayService.mapByStatDate(DateUtil.formatDate(beginTime), DateUtil.formatDate(endTime), partitionId, guildIds);
for (GuildInfoVo record : records) {
record.setDiamondNum(BigDecimal.valueOf(guildDiamondMap.getOrDefault(record.getGuildId(), 0D)));
}
}
} else {
guilds = bdGuildService.guildsByBdId(bdId, pageNo, pageSize);
List<GuildInfoVo> records = guilds.getRecords();