hy/aslan-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

团队显示工作天数修复

Browse Source
This commit is contained in:
tianfeng 2025-11-21 11:22:05 +08:00
parent b3f4e9c665
commit 3b15cc576b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/team/query/TeamBillWorkMembersQryExe.java
View File

@ -11,6 +11,7 @@ import com.red.circle.other.domain.gateway.user.UserProfileGateway;
import com.red.circle.other.domain.model.user.UserProfile; import com.red.circle.other.domain.model.user.UserProfile;
import com.red.circle.other.infra.database.mongo.entity.team.team.TeamBillCycle; import com.red.circle.other.infra.database.mongo.entity.team.team.TeamBillCycle;
import com.red.circle.other.infra.database.mongo.entity.team.team.TeamMemberTarget; import com.red.circle.other.infra.database.mongo.entity.team.team.TeamMemberTarget;
import com.red.circle.other.infra.database.mongo.service.team.TeamBillCycleUtils;
import com.red.circle.other.infra.database.mongo.service.team.team.TeamBillCycleService; import com.red.circle.other.infra.database.mongo.service.team.team.TeamBillCycleService;
import com.red.circle.other.infra.database.mongo.service.team.team.TeamMemberTargetService; import com.red.circle.other.infra.database.mongo.service.team.team.TeamMemberTargetService;
import com.red.circle.other.infra.database.rds.entity.team.BillDiamondBalance; import com.red.circle.other.infra.database.rds.entity.team.BillDiamondBalance;
@ -81,6 +82,7 @@ public class TeamBillWorkMembersQryExe {
.setId(target.getTeamId()) .setId(target.getTeamId())
.setAcceptGiftValue(target.sumAcceptGiftValue()) .setAcceptGiftValue(target.sumAcceptGiftValue())
.setAcceptGiftValueFormat(NumUtils.formatLong(target.sumAcceptGiftValue())) .setAcceptGiftValueFormat(NumUtils.formatLong(target.sumAcceptGiftValue()))
.setEffectiveDay(TeamBillCycleUtils.calculateEffectiveDay(target))
.setOnlineTime(target.sumAllTargetTime()); .setOnlineTime(target.sumAllTargetTime());
} }
return new TeamMemberWorkTargetCO() return new TeamMemberWorkTargetCO()
@ -88,6 +90,7 @@ public class TeamBillWorkMembersQryExe {
.setAcceptGiftValue(settlementResult.getAcceptGiftValue()) .setAcceptGiftValue(settlementResult.getAcceptGiftValue())
.setAcceptGiftValueFormat(NumUtils.formatLong(settlementResult.getAcceptGiftValue())) .setAcceptGiftValueFormat(NumUtils.formatLong(settlementResult.getAcceptGiftValue()))
.setOnlineTime(settlementResult.getOnlineTime()) .setOnlineTime(settlementResult.getOnlineTime())
.setEffectiveDay(TeamBillCycleUtils.calculateEffectiveDay(target))
.setSettlementResult( .setSettlementResult(
teamAppConvertor.toTeamMemberTargetSettlementResultCO(settlementResult)); teamAppConvertor.toTeamMemberTargetSettlementResultCO(settlementResult));
} }

2
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/TeamBillCycleUtils.java
View File

@ -142,7 +142,7 @@ public final class TeamBillCycleUtils {
* @param target 成员目标数据 * @param target 成员目标数据
* @return 有效天数 * @return 有效天数
*/ */
private static Integer calculateEffectiveDay(TeamMemberTarget target) { public static Integer calculateEffectiveDay(TeamMemberTarget target) {
if (target == null || target.getDailyTargets() == null) { if (target == null || target.getDailyTargets() == null) {
return 0; return 0;
} }