From aa486c33c957cf20ac4a6f6c148691e451d1eef8 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 15 Jun 2022 10:39:39 +0800 Subject: [PATCH] fix teamList --- src/main/java/cc/mrbird/febs/mall/vo/TeamListVo.java | 3 +++ src/main/resources/mapper/modules/MallMemberMapper.xml | 2 ++ src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 11 ----------- 3 files changed, 5 insertions(+), 11 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 2125d43..55cc8e8 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 @@ -315,17 +315,6 @@ MallMember mallMember = this.baseMapper.selectById(memberId); List<TeamListVo> list = this.baseMapper.selectTeamListByInviteId(mallMember.getInviteId()); -// BigDecimal ownAmount = this.baseMapper.selectOwnOrderAmountByInviteId(mallMember.getInviteId()); -// TeamListVo own = new TeamListVo(); -// own.setCreatedTime(mallMember.getCreatedTime()); -// own.setAmount(ownAmount); -// own.setName(mallMember.getName()); -// own.setPhone(mallMember.getPhone()); -// own.setInviteId(mallMember.getInviteId()); -// own.setIsCurrent(1); -// own.setCnt(this.baseMapper.selectOwnCntByInviteId(mallMember.getInviteId())); -// own.setOrderCnt(this.baseMapper.selectOwnOrderCntByInviteId(mallMember.getInviteId())); -// own.setId(mallMember.getId()); MyTeamVo myTeamVo = new MyTeamVo(); myTeamVo.setTeam(list); diff --git a/src/main/java/cc/mrbird/febs/mall/vo/TeamListVo.java b/src/main/java/cc/mrbird/febs/mall/vo/TeamListVo.java index e365f12..d92a485 100644 --- a/src/main/java/cc/mrbird/febs/mall/vo/TeamListVo.java +++ b/src/main/java/cc/mrbird/febs/mall/vo/TeamListVo.java @@ -47,4 +47,7 @@ @ApiModelProperty(value = "竞猜积分") private BigDecimal prizeScore; + @ApiModelProperty(value = "用户等级") + private String levelName; + } diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml index 104fa59..30a114d 100644 --- a/src/main/resources/mapper/modules/MallMemberMapper.xml +++ b/src/main/resources/mapper/modules/MallMemberMapper.xml @@ -77,6 +77,7 @@ 2 isCurrent, a.created_time, p.prize_score, + u.description levelName, (select sum(e.amount) from mall_order_info e inner join mall_member b on e.member_id=b.ID @@ -88,6 +89,7 @@ (select count(1) from mall_member x where x.referrer_id=a.invite_id) cnt from mall_member a inner join mall_member_wallet p on a.id=p.member_id + left join data_dictionary_custom u on a.level=u.code and u.type='AGENT_LEVEL' where a.referrer_id=#{inviteId} </select> -- Gitblit v1.9.1