From ebf31962a00aa4b3bb7d17274133821352f1522d Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Tue, 14 Jan 2025 10:34:26 +0800 Subject: [PATCH] feat(mall): 增加团队总览功能 --- src/main/java/cc/mrbird/febs/mall/vo/MyTeamVo.java | 15 ++++++++++++--- src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 7 +++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java index 5391021..c094866 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java @@ -464,6 +464,13 @@ myTeamVo.setMyTeamBalance(getTeamBalance(mallMembers).getMyTeamBalance()); myTeamVo.setMyTeamCommission(getTeamBalance(mallMembers).getMyTeamCommission()); + List<MallMember> mallMembersAll = this.baseMapper.selectAllChildAgentListByInviteId(mallMember.getInviteId()); + if(CollUtil.isNotEmpty(mallMembersAll)){ + myTeamVo.setMyTeamCntAll(mallMembersAll.size()); + myTeamVo.setMyTeamBalanceAll(getTeamBalance(mallMembersAll).getMyTeamBalance()); + myTeamVo.setMyTeamCommissionAll(getTeamBalance(mallMembersAll).getMyTeamCommission()); + } + List<TeamListVo> teamListVos = MallMemberConversion.INSTANCE.entityToTeamListVos(mallMembers); teamListVos.forEach(item -> { item.setMyBalance(mallMemberWalletMapper.selectWalletByMemberId(item.getId()).getBalance()); diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MyTeamVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MyTeamVo.java index dc1bb43..e9e4678 100644 --- a/src/main/java/cc/mrbird/febs/mall/vo/MyTeamVo.java +++ b/src/main/java/cc/mrbird/febs/mall/vo/MyTeamVo.java @@ -20,15 +20,24 @@ @ApiModelProperty(value = "我的USDT") private BigDecimal myCommission = BigDecimal.ZERO; - @ApiModelProperty(value = "团队总数") + @ApiModelProperty(value = "直推总数") private int myTeamCnt = 0; - @ApiModelProperty(value = "团队碳币") + @ApiModelProperty(value = "直推碳币") private BigDecimal myTeamBalance = BigDecimal.ZERO; - @ApiModelProperty(value = "团队USDT") + @ApiModelProperty(value = "直推USDT") private BigDecimal myTeamCommission = BigDecimal.ZERO; + @ApiModelProperty(value = "团队总数") + private int myTeamCntAll = 0; + + @ApiModelProperty(value = "团队碳币") + private BigDecimal myTeamBalanceAll = BigDecimal.ZERO; + + @ApiModelProperty(value = "团队USDT") + private BigDecimal myTeamCommissionAll = BigDecimal.ZERO; + /** * 是否是节点 1是 0否 */ -- Gitblit v1.9.1