From 3c680cf63a02107af8afb0e498dbd1d24aa1a65e Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Mon, 10 Nov 2025 18:17:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E5=8D=95=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../command/team/query/TeamBillQryExe.java | 145 +----------------- .../team/query/TeamBillWorkMembersQryExe.java | 7 +- 2 files changed, 2 insertions(+), 150 deletions(-) diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/team/query/TeamBillQryExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/team/query/TeamBillQryExe.java index 914b22f6..54d0d01d 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/team/query/TeamBillQryExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/team/query/TeamBillQryExe.java @@ -48,10 +48,7 @@ public class TeamBillQryExe { private static final Logger log = LoggerFactory.getLogger(TeamBillQryExe.class); private final TeamAppConvertor teamAppConvertor; private final TeamBillCycleService teamBillCycleService; - private final TeamPolicyManagerService teamPolicyManagerService; - private final SysRegionConfigService sysRegionConfigService; private final BillDiamondBalanceService billDiamondBalanceService; - private final BillDiamondBalanceDetailsService billDiamondBalanceDetailsService; public List execute(AppIdLongCmd cmd) { @@ -87,147 +84,7 @@ public class TeamBillQryExe { if (CollectionUtils.isEmpty(teamBillCycles)) { return Lists.newArrayList(); } - List teamBill = teamBillCycles.stream().map(teamAppConvertor::toTeamBillCO).collect(Collectors.toList()); - for (TeamBillCO teamBillCO : teamBill) { - if (!Objects.isNull(teamBillCO.getSettleResult())) { - BillDiamondBalance billDiamondBalance = billDiamondBalanceService - .getEntityByBillBelongAndUserId(SysOriginPlatformEnum.TARAB.name(), teamBillCO.getBillBelong(), cmd.getReqUserId()); - if (!Objects.isNull(billDiamondBalance)) { - teamBillCO.getSettleResult().setRedeemedSalary(Objects.isNull(billDiamondBalance.getAgentConsumptionPoints()) ? BigDecimal.ZERO : billDiamondBalance.getAgentConsumptionPoints()); - } else { - teamBillCO.getSettleResult().setRedeemedSalary(BigDecimal.ZERO); - } - // 用户剩余工资=用户工资-用户已兑换工资 - BigDecimal surplusSalary = teamBillCO.getSettleResult().getOwnSalary().subtract(teamBillCO.getSettleResult().getRedeemedSalary()); - teamBillCO.getSettleResult().setSurplusSalary(surplusSalary); - } - } - - // 经产品和运营确认，如果是钻石政策并且是日结区域，显示日账单列表 - TeamPolicyManager policy = teamPolicyManagerService.getReleaseByRegionAndType(SysOriginPlatformEnum.LIKEI.name(), teamBillCycles.get(0).getRegion()); - if (Objects.isNull(policy)) { - return teamBill; - } - SysRegionConfig regionConfig = sysRegionConfigService.getById(policy.getRegion()); - Map metadata = getMetadata(regionConfig); - boolean isOpenDailyAutoSalary = isOpenDailyAutoSalary(metadata); - //log.warn("regionConfig" + regionConfig); - if (Objects.equals(TeamPolicyTypeEnum.SALARY_DIAMOND.name(), policy.getPolicyType()) - && Boolean.TRUE.equals(isOpenDailyAutoSalary)) { - List teamDayBill = new ArrayList<>(); - for (TeamBillCO teamBillCO : teamBill) { - List billDiamondBalances = billDiamondBalanceDetailsService.getEntityByBillBelongAndTeamId(SysOriginPlatformEnum.TARAB.name(), teamBillCO.getBillBelong(), cmd.getId()); - /*List billBalance = billDiamondBalances.stream().distinct() - .sorted(Comparator.comparing(BillDiamondBalanceDetails::getBillBelongDay).reversed()).toList();*/ - Map> billBalanceMap = billDiamondBalances.stream() - .collect(Collectors.groupingBy(BillDiamondBalanceDetails::getBillBelongDay));; - Map> sortedMap = new TreeMap<>(Comparator.reverseOrder()); - sortedMap.putAll(billBalanceMap); - - for(Map.Entry> entry : sortedMap.entrySet()){ - Integer billBelongDay = entry.getKey(); - - BillDiamondBalanceDetails diamondBalance = billDiamondBalances.stream() - .filter(item -> item.getUserId().equals(cmd.getReqUserId()) && - item.getBillBelongDay().equals(billBelongDay)).findFirst().orElse(null); - if (Objects.isNull(diamondBalance)) { - continue; - } - - TeamBillCO teamBillInfo = new TeamBillCO(); - teamBillInfo.setId(teamBillCO.getId()); - teamBillInfo.setBillTitle(teamBillCO.getBillTitle()); - teamBillInfo.setBillBelong(teamBillCO.getBillBelong()); - teamBillInfo.setBillDayTitle(diamondBalance.getBillBelongDay() + ""); - if (billBelongDay.equals(ZonedDateTimeAsiaRiyadhUtils.nowDateToInt())) { - teamBillInfo.setGoldStatus(Boolean.TRUE); - teamBillInfo.setStatus(TeamBillCycleStatus.UNPAID.name()); - } else { - teamBillInfo.setGoldStatus(Boolean.FALSE); - teamBillInfo.setStatus(TeamBillCycleStatus.PAY_OUT.name()); - } - teamBillInfo.setMemberTargetStatus(TeamMemberTargetStatus.AUTO.name()); - TeamBillSettleResultCO teamBillSettleResultCO = new TeamBillSettleResultCO(); - teamBillSettleResultCO.setWorkMembers(billDiamondBalances.stream().filter(item -> item.getBillBelongDay().equals(billBelongDay)).toList().size());//工作人数 - teamBillSettleResultCO.setFinishMembers(billDiamondBalances.stream().filter(item -> item.getBillBelongDay().equals(billBelongDay)).toList().size());//完成人数 - BigDecimal memberSalary = billDiamondBalances.stream() - .filter(item -> item.getBillBelongDay().equals(billBelongDay)) - .map(item -> item.getEarnPoints().setScale(0, RoundingMode.DOWN)) - .reduce(BigDecimal.ZERO, BigDecimal::add); - teamBillSettleResultCO.setMemberSalary(memberSalary);//成员工资 - BigDecimal ownSalary = billDiamondBalances.stream() - .filter(item -> item.getBillBelongDay().equals(billBelongDay)) - .map(item -> item.getAgentEarnPoints().setScale(0, RoundingMode.DOWN)) - .reduce(BigDecimal.ZERO, BigDecimal::add); - teamBillSettleResultCO.setOwnSalary(ownSalary);//拥有者工资 - BigDecimal totalSalary = memberSalary.add(ownSalary);//工资合计memberSalary+ownSalary. - teamBillSettleResultCO.setTotalSalary(totalSalary); - BigDecimal redeemedSalary = billDiamondBalances.stream() - .filter(item -> item.getBillBelongDay().equals(billBelongDay) && item.getUserId().equals(cmd.getReqUserId())) - .map(item -> item.getAgentConsumptionPoints().setScale(0, RoundingMode.DOWN)) - .reduce(BigDecimal.ZERO, BigDecimal::add); - teamBillSettleResultCO.setRedeemedSalary(redeemedSalary);//已兑换工资（钻石） - BigDecimal surplusSalary = billDiamondBalances.stream() - .filter(item -> item.getBillBelongDay().equals(billBelongDay) && item.getUserId().equals(cmd.getReqUserId())) - .map(item -> item.getAgentBalance().setScale(0, RoundingMode.DOWN)) - .reduce(BigDecimal.ZERO, BigDecimal::add); - teamBillSettleResultCO.setSurplusSalary(surplusSalary);// 剩余工资（钻石） - - teamBillInfo.setSettleResult(teamBillSettleResultCO); - teamDayBill.add(teamBillInfo); - } - - /*for (BillDiamondBalanceDetails billDiamondBalance : billBalance) { - BillDiamondBalanceDetails diamondBalance = billDiamondBalances.stream() - .filter(item -> item.getUserId().equals(cmd.getReqUserId()) && - item.getBillBelongDay().equals(billDiamondBalance.getBillBelongDay())).findFirst().orElse(null); - - TeamBillCO teamBillInfo = new TeamBillCO(); - teamBillInfo.setId(teamBillCO.getId()); - teamBillInfo.setBillTitle(teamBillCO.getBillTitle()); - teamBillInfo.setBillBelong(teamBillCO.getBillBelong()); - teamBillInfo.setBillDayTitle(diamondBalance.getBillBelongDay()+""); - if (billDiamondBalance.getBillBelongDay().equals(ZonedDateTimeAsiaRiyadhUtils.nowDateToInt())) { - teamBillInfo.setGoldStatus(Boolean.TRUE); - teamBillInfo.setStatus(TeamBillCycleStatus.UNPAID.name()); - } else { - teamBillInfo.setGoldStatus(Boolean.FALSE); - teamBillInfo.setStatus(TeamBillCycleStatus.PAY_OUT.name()); - } - teamBillInfo.setMemberTargetStatus(TeamMemberTargetStatus.AUTO.name()); - TeamBillSettleResultCO teamBillSettleResultCO = new TeamBillSettleResultCO(); - teamBillSettleResultCO.setWorkMembers(billDiamondBalances.stream().filter(item -> item.getBillBelongDay().equals(billDiamondBalance.getBillBelongDay())).toList().size());//工作人数 - teamBillSettleResultCO.setFinishMembers(billDiamondBalances.stream().filter(item -> item.getBillBelongDay().equals(billDiamondBalance.getBillBelongDay())).toList().size());//完成人数 - BigDecimal memberSalary = billDiamondBalances.stream() - .filter(item -> item.getBillBelongDay().equals(billDiamondBalance.getBillBelongDay())) - .map(BillDiamondBalanceDetails::getEarnPoints) - .reduce(BigDecimal.ZERO, BigDecimal::add); - teamBillSettleResultCO.setMemberSalary(memberSalary);//成员工资 - BigDecimal ownSalary = billDiamondBalances.stream() - .filter(item -> item.getBillBelongDay().equals(billDiamondBalance.getBillBelongDay())) - .map(BillDiamondBalanceDetails::getAgentEarnPoints) - .reduce(BigDecimal.ZERO, BigDecimal::add); - teamBillSettleResultCO.setOwnSalary(ownSalary);//拥有者工资 - teamBillSettleResultCO.setTotalSalary(memberSalary.add(ownSalary));//工资合计memberSalary+ownSalary. - BigDecimal redeemedSalary = billDiamondBalances.stream() - .filter(item -> item.getBillBelongDay().equals(billDiamondBalance.getBillBelongDay()) && item.getUserId().equals(cmd.getReqUserId())) - .map(balance -> balance.getConsumptionPoints().add(balance.getAgentConsumptionPoints())) - .reduce(BigDecimal.ZERO, BigDecimal::add); - teamBillSettleResultCO.setRedeemedSalary(redeemedSalary);//已兑换工资（钻石） - BigDecimal surplusSalary = billDiamondBalances.stream() - .filter(item -> item.getBillBelongDay().equals(billDiamondBalance.getBillBelongDay()) && item.getUserId().equals(cmd.getReqUserId())) - .map(balance -> balance.getBalance().add(balance.getAgentBalance())) - .reduce(BigDecimal.ZERO, BigDecimal::add); - teamBillSettleResultCO.setSurplusSalary(surplusSalary);// 剩余工资（钻石） - - teamBillInfo.setSettleResult(teamBillSettleResultCO); - teamDayBill.add(teamBillInfo); - }*/ - } - - return teamDayBill; - } - return teamBill; + return teamBillCycles.stream().map(teamAppConvertor::toTeamBillCO).collect(Collectors.toList()); } private static List filter(List stringList, Integer dateNumBer) { diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/team/query/TeamBillWorkMembersQryExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/team/query/TeamBillWorkMembersQryExe.java index fad4bac3..e7fbbb1a 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/team/query/TeamBillWorkMembersQryExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/team/query/TeamBillWorkMembersQryExe.java @@ -76,23 +76,18 @@ public class TeamBillWorkMembersQryExe { private TeamMemberWorkTargetCO assembleTarget(TeamMemberTarget target) { TeamMemberTargetSettlementResult settlementResult = target.getSettlementResult(); - BillDiamondBalance billDiamondBalance = billDiamondBalanceService.getEntityByBillBelongAndUserId(target.getSysOrigin(), target.getBillBelong(), target.getUserId()); - log.warn("团结账单工作成员信息assembleTarget: {}", target); - log.warn("团结账单工作成员信息billDiamondBalance: {}", billDiamondBalance); if (Objects.isNull(settlementResult)) { return new TeamMemberWorkTargetCO() .setId(target.getTeamId()) .setAcceptGiftValue(target.sumAcceptGiftValue()) .setAcceptGiftValueFormat(NumUtils.formatLong(target.sumAcceptGiftValue())) - .setOnlineTime(target.sumAllTargetTime()) - .setSurplusDiamonds(Objects.nonNull(billDiamondBalance) ? billDiamondBalance.getBalance().setScale(0, RoundingMode.DOWN) + "" : "0"); + .setOnlineTime(target.sumAllTargetTime()); } return new TeamMemberWorkTargetCO() .setId(target.getTeamId()) .setAcceptGiftValue(settlementResult.getAcceptGiftValue()) .setAcceptGiftValueFormat(NumUtils.formatLong(settlementResult.getAcceptGiftValue())) .setOnlineTime(settlementResult.getOnlineTime()) - .setSurplusDiamonds(Objects.nonNull(billDiamondBalance) ? billDiamondBalance.getBalance().setScale(0, RoundingMode.DOWN) + "" : "0") .setSettlementResult( teamAppConvertor.toTeamMemberTargetSettlementResultCO(settlementResult)); }