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

土耳其薪资结算数据

Browse Source
This commit is contained in:
hokli
2025-10-10 14:28:53 +08:00
parent 9cf6b05473
commit 334635fb4a
13 changed files with 286 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildDiamondStatisticsDayAdminService.java
View File

@@ -74,7 +74,7 @@ public class GuildDiamondStatisticsDayAdminService {
Page<GuildDiamondStatisticsDayVo> guildDiamondStatisticsDayPage;
if (GUILD_POLICY2.equals(partitionEnum.getClanMode())) {
guildDiamondStatisticsDayPage =
guildDiamondStatisticsPolicy2Service.listByStatDate4OldPolicy(startDate, endDate, partitionId, regionId, guildId, pageNo, pageSize, inviteUid);
guildDiamondStatisticsPolicy2Service.listByStatDate4Policy2(startDate, endDate, partitionId, regionId, guildId, pageNo, pageSize, inviteUid);
} else {
guildDiamondStatisticsDayPage =
guildDiamondStatisticsDayService.listByStatDate(startDate, endDate, partitionId, regionId, guildId, pageNo, pageSize, inviteUid);

49
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guildpolicy2/GuildPolicy2AdminService.java
View File

@@ -3,16 +3,16 @@ package com.accompany.admin.service.guildpolicy2;
import com.accompany.business.model.guild.Guild;
import com.accompany.business.model.guildpolicy2.GuildDiamondWagePolicy2;
import com.accompany.business.service.guild.GuildService;
import com.accompany.business.service.guildpolicy2.GuildDiamondStatisticsPolicy2Service;
import com.accompany.business.service.guildpolicy2.GuildDiamondWagePolicy2Service;
import com.accompany.business.service.guildpolicy2.GuildMicStatisticsPolicy2Service;
import com.accompany.business.service.guildpolicy2.GuildPolicy2Service;
import com.accompany.business.service.guildpolicy2.*;
import com.accompany.business.service.user.UsersService;
import com.accompany.business.util.FullMonthCycleTimeUtil;
import com.accompany.business.vo.guild.CycleDateVo;
import com.accompany.business.vo.guildpolicy.GuildMemberMicDayVo;
import com.accompany.business.vo.guildpolicy.GuildPolicy2MemberAdminVo;
import com.accompany.common.result.BusiResult;
import com.accompany.common.result.PageResult;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.core.enumeration.PartitionEnum;
import com.accompany.core.exception.AdminServiceException;
import com.accompany.core.model.Users;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -22,6 +22,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.time.ZonedDateTime;
import java.util.Date;
import java.util.List;
import java.util.TreeMap;
@@ -40,6 +42,8 @@ public class GuildPolicy2AdminService {
private GuildService guildService;
@Autowired
private GuildMicStatisticsPolicy2Service guildMicStatisticsPolicy2Service;
@Autowired
private GuildDiamondStatisticsPolicy2SettleService guildDiamondStatisticsPolicy2SettleService;
public PageResult<GuildPolicy2MemberAdminVo> queryMemberPage(Long ownerErbanNo, Integer guildId, Long erbanNo,
Integer partitionId, String startDate, String endDate, Integer pageNo, Integer pageSize) {
@@ -65,22 +69,31 @@ public class GuildPolicy2AdminService {
}
guildId = vaildGuildByOwnerUid.getId();
}
Page<GuildPolicy2MemberAdminVo> voPage = guildDiamondStatisticsPolicy2Service.listByStatDate(startDate, endDate, partitionId, guildId, uid, pageNo, pageSize);
List<GuildPolicy2MemberAdminVo> records = voPage.getRecords();
PageResult<GuildPolicy2MemberAdminVo> pageResult = new PageResult<>(voPage);
if (CollectionUtils.isEmpty(records)) {
return pageResult;
}
TreeMap<BigDecimal, GuildDiamondWagePolicy2> diamondWageMap = guildDiamondWagePolicy2Service.getDiamondWageMap(partitionId);
for (GuildPolicy2MemberAdminVo record : records) {
GuildDiamondWagePolicy2 diamondWagePolicy2 = guildDiamondWagePolicy2Service.calDiamondWageVo(diamondWageMap, record.getDiamondNum(), record.getMicDay());
if (diamondWagePolicy2 == null) {
continue;
ZonedDateTime zonedDateTime = DateTimeUtil.convertWithZoneId(new Date(), PartitionEnum.TURKEY.getZoneId());
String nowDate = FullMonthCycleTimeUtil.getCycleDate(zonedDateTime);
PageResult<GuildPolicy2MemberAdminVo> pageResult;
if (nowDate.equals(startDate) || startDate.compareTo("2025-09-01") <= 0) {
Page<GuildPolicy2MemberAdminVo> voPage = guildDiamondStatisticsPolicy2Service.listByStatDate(startDate, endDate, partitionId, guildId, uid, pageNo, pageSize);
List<GuildPolicy2MemberAdminVo> records = voPage.getRecords();
pageResult = new PageResult<>(voPage);
if (CollectionUtils.isEmpty(records)) {
return pageResult;
}
record.setAnchorDiamondSalary(diamondWagePolicy2.getAnchorDiamondSalary());
record.setOwnerSalary(diamondWagePolicy2.getOwnerSalary());
record.setAnchorMicSalary(diamondWagePolicy2.getAnchorMicSalary());
TreeMap<BigDecimal, GuildDiamondWagePolicy2> diamondWageMap = guildDiamondWagePolicy2Service.getDiamondWageMap(partitionId);
for (GuildPolicy2MemberAdminVo record : records) {
GuildDiamondWagePolicy2 diamondWagePolicy2 = guildDiamondWagePolicy2Service.calDiamondWageVo(diamondWageMap, record.getDiamondNum(), record.getMicDay());
if (diamondWagePolicy2 == null) {
continue;
}
record.setAnchorDiamondSalary(diamondWagePolicy2.getAnchorDiamondSalary());
record.setOwnerSalary(diamondWagePolicy2.getOwnerSalary());
record.setAnchorMicSalary(diamondWagePolicy2.getAnchorMicSalary());
}
} else {
Page<GuildPolicy2MemberAdminVo> voPage = guildDiamondStatisticsPolicy2SettleService.listByStatDate(startDate, partitionId, guildId, uid, pageNo, pageSize);
pageResult = new PageResult<>(voPage);
}
return pageResult;
}