From ffd586b4b93665e1bf90df114e5eda71b47f20a8 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Tue, 08 Jun 2021 16:24:37 +0800 Subject: [PATCH] modify --- src/main/java/com/xcong/excoin/modules/otc/vo/TeamVo.java | 3 +++ src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java | 2 ++ src/main/resources/mapper/otc/OtcReturnMoneyDao.xml | 1 + src/main/resources/mapper/member/MemberDao.xml | 4 ++++ src/main/java/com/xcong/excoin/modules/member/dao/MemberDao.java | 2 ++ 5 files changed, 12 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/member/dao/MemberDao.java b/src/main/java/com/xcong/excoin/modules/member/dao/MemberDao.java index 2310b26..c46067f 100644 --- a/src/main/java/com/xcong/excoin/modules/member/dao/MemberDao.java +++ b/src/main/java/com/xcong/excoin/modules/member/dao/MemberDao.java @@ -24,4 +24,6 @@ public List<MemberEntity> selectAllMember(); List<MemberEntity> selectMemberListByReferer(@Param("list") List<String> list); + + Integer selectMemberTeamCnt(@Param("inviteId") String inviteId); } diff --git a/src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java b/src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java index 125b974..bb204a1 100644 --- a/src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java +++ b/src/main/java/com/xcong/excoin/modules/otc/controller/OtcOrderController.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.xcong.excoin.common.LoginUserUtils; import com.xcong.excoin.common.response.Result; +import com.xcong.excoin.modules.member.dao.MemberDao; import com.xcong.excoin.modules.member.entity.MemberEntity; import com.xcong.excoin.modules.otc.dao.OtcReturnMoneyDao; import com.xcong.excoin.modules.otc.dto.*; @@ -113,6 +114,7 @@ MemberEntity member = LoginUserUtils.getAppLoginUser(); IPage<TeamVo> data = otcReturnMoneyDao.selectMyTeamAmountInPage(member.getInviteId(), member.getId(), page); BigDecimal totalAmount = otcReturnMoneyDao.selectTotalAmount(member.getId()); + Map<String, Object> result = new HashMap<>(); result.put("totalCnt", data.getTotal()); result.put("totalAmount", totalAmount); diff --git a/src/main/java/com/xcong/excoin/modules/otc/vo/TeamVo.java b/src/main/java/com/xcong/excoin/modules/otc/vo/TeamVo.java index 6987c8d..c9662cb 100644 --- a/src/main/java/com/xcong/excoin/modules/otc/vo/TeamVo.java +++ b/src/main/java/com/xcong/excoin/modules/otc/vo/TeamVo.java @@ -18,4 +18,7 @@ @ApiModelProperty(value = "金额") private BigDecimal amount; + + @ApiModelProperty(value = "团队人数") + private Integer cnt; } diff --git a/src/main/resources/mapper/member/MemberDao.xml b/src/main/resources/mapper/member/MemberDao.xml index 1d46325..2ba9ac0 100644 --- a/src/main/resources/mapper/member/MemberDao.xml +++ b/src/main/resources/mapper/member/MemberDao.xml @@ -58,4 +58,8 @@ </foreach > order by id desc limit 2 </select> + + <select id="selectMemberTeamCnt" resultType="java.lang.Integer"> + select count(1) from member where find_in_set(#{inviteId}, SUBSTRING_INDEX(referer_ids, ',', 3)) + </select> </mapper> \ No newline at end of file diff --git a/src/main/resources/mapper/otc/OtcReturnMoneyDao.xml b/src/main/resources/mapper/otc/OtcReturnMoneyDao.xml index 00c49bf..bb9ba46 100644 --- a/src/main/resources/mapper/otc/OtcReturnMoneyDao.xml +++ b/src/main/resources/mapper/otc/OtcReturnMoneyDao.xml @@ -7,6 +7,7 @@ substring(invite_id, -4) inviteId, case when a.referer_id = #{inviteId} then 1 else 2 end level, + (select count(1) from member c where find_in_set(a.invite_id, SUBSTRING_INDEX(c.referer_ids, ',', 3))) cnt, sum(IFNULL(b.amount, 0)) amount from member a left join otc_return_money b on b.from_member_id=a.id and b.to_member_id=#{memberId} -- Gitblit v1.9.1