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

公会-后台-公会钻石薪资流水-实时根据diamond_static计算

Browse Source
This commit is contained in:
khalil
2025-10-10 12:34:25 +08:00
parent 5702f33a43
commit 928781fc06
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildSettleRecordAdminService.java
View File

@@ -88,6 +88,11 @@ public class GuildSettleRecordAdminService {
String curCycleDate = FullMonthCycleTimeUtil.getCurCycleDateByZoneId(partitionInfo.getZoneId()); String curCycleDate = FullMonthCycleTimeUtil.getCurCycleDateByZoneId(partitionInfo.getZoneId());
if (curCycleDate.equals(basePageParams.getDateCycle()) || basePageParams.getDateCycle().equals("2025-09-01")){ if (curCycleDate.equals(basePageParams.getDateCycle()) || basePageParams.getDateCycle().equals("2025-09-01")){
String endDate = FullMonthCycleTimeUtil.getCurCycleEndDateByZoneId(partitionInfo.getZoneId()); String endDate = FullMonthCycleTimeUtil.getCurCycleEndDateByZoneId(partitionInfo.getZoneId());
if (!curCycleDate.equals(basePageParams.getDateCycle())){
curCycleDate = basePageParams.getDateCycle();
endDate = "2025-09-30";
}
List<GuildSettleRecord> poList = guildSettleService.cal(basePageParams.getPartitionId(), curCycleDate, endDate, gId, basePageParams.getRegionId()); List<GuildSettleRecord> poList = guildSettleService.cal(basePageParams.getPartitionId(), curCycleDate, endDate, gId, basePageParams.getRegionId());
if (CollectionUtils.isEmpty(poList)){ if (CollectionUtils.isEmpty(poList)){
return voPage; return voPage;