9月公会数据不差结算记录
This commit is contained in:
@@ -6,7 +6,10 @@ import com.accompany.business.model.guild.Guild;
|
|||||||
import com.accompany.business.model.guild.GuildMember;
|
import com.accompany.business.model.guild.GuildMember;
|
||||||
import com.accompany.business.model.guild.GuildSettleRecord;
|
import com.accompany.business.model.guild.GuildSettleRecord;
|
||||||
import com.accompany.business.param.BasePageParams;
|
import com.accompany.business.param.BasePageParams;
|
||||||
import com.accompany.business.service.guild.*;
|
import com.accompany.business.service.guild.GuildMemberService;
|
||||||
|
import com.accompany.business.service.guild.GuildService;
|
||||||
|
import com.accompany.business.service.guild.GuildSettleRecordService;
|
||||||
|
import com.accompany.business.service.guild.GuildSettleService;
|
||||||
import com.accompany.business.service.user.UsersService;
|
import com.accompany.business.service.user.UsersService;
|
||||||
import com.accompany.business.util.FullMonthCycleTimeUtil;
|
import com.accompany.business.util.FullMonthCycleTimeUtil;
|
||||||
import com.accompany.common.status.BusiStatus;
|
import com.accompany.common.status.BusiStatus;
|
||||||
@@ -83,7 +86,7 @@ public class GuildSettleRecordAdminService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
String curCycleDate = FullMonthCycleTimeUtil.getCurCycleDateByZoneId(partitionInfo.getZoneId());
|
String curCycleDate = FullMonthCycleTimeUtil.getCurCycleDateByZoneId(partitionInfo.getZoneId());
|
||||||
if (curCycleDate.equals(basePageParams.getDateCycle())){
|
if (curCycleDate.equals(basePageParams.getDateCycle()) || basePageParams.getDateCycle().equals("2025-09-01")){
|
||||||
String endDate = FullMonthCycleTimeUtil.getCurCycleEndDateByZoneId(partitionInfo.getZoneId());
|
String endDate = FullMonthCycleTimeUtil.getCurCycleEndDateByZoneId(partitionInfo.getZoneId());
|
||||||
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)){
|
||||||
|
Reference in New Issue
Block a user