From 7dcfa12372a6cbaee0c36fd9e532e3df0a43c2ac Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 04 Mar 2022 15:12:45 +0800
Subject: [PATCH] Merge branch 'bea' of http://120.27.238.55:7000/r/exchange into bea
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index 301e739..4f57a5e 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -80,6 +80,9 @@
private MemberWalletCoinDao memberWalletCoinDao;
@Resource
+ private MemberCoinAddressInDao memberCoinAddressInDao;
+
+ @Resource
private ZhiYaDao zhiYaDao;
@Resource
@@ -1040,17 +1043,33 @@
MemberEntity member = memberDao.selectById(memberId);
MemberTeamVo memberTeamVo = memberDao.selectAllTeamByInviteIdInPage(memberId,member.getInviteId());
List<TeamVo> teamVos = new ArrayList<>();
+ //直属会员
+ List<MemberEntity> memberZhiShu = memberDao.selectMemberInfoByRefererId(member.getInviteId());
if(ObjectUtil.isEmpty(memberTeamVo)){
MemberTeamVo memberTeamVoNull = new MemberTeamVo();
Integer teamCnt = memberDao.selectMemberCountByInvitedId(member.getInviteId());
memberTeamVoNull.setTeamCnt(teamCnt);
memberTeamVoNull.setZhiyaCnt(BigDecimal.ZERO);
memberTeamVoNull.setRewardCnt(BigDecimal.ZERO);
- memberTeamVoNull.setTeamVo(teamVos);
+ //直属会员
+ if(CollUtil.isNotEmpty(memberZhiShu)){
+ for(MemberEntity zhishu : memberZhiShu){
+ TeamVo teamVo = new TeamVo();
+ String phone = zhishu.getPhone();
+ if(StrUtil.isNotEmpty(phone)){
+ String result = phone.substring(phone.length()-4,phone.length());
+ teamVo.setAccount(result);
+ }
+ int memberCnt = memberDao.selectMemberCountByInvitedId(zhishu.getInviteId());
+ teamVo.setTeamCnt(memberCnt);
+ teamVo.setZhiyaCnt(BigDecimal.ZERO);
+ teamVo.setRewardCnt(BigDecimal.ZERO);
+ teamVos.add(teamVo);
+ }
+ memberTeamVoNull.setTeamVo(teamVos);
+ }
return Result.ok(memberTeamVoNull);
}
- //直属会员
- List<MemberEntity> memberZhiShu = memberDao.selectMemberInfoByRefererId(member.getInviteId());
if(CollUtil.isNotEmpty(memberZhiShu)){
for(MemberEntity zhishu : memberZhiShu){
Long zhiShuMemberId = zhishu.getId();
@@ -1078,6 +1097,27 @@
}
return Result.ok(memberTeamVo);
}
+
+ @Override
+ public Result memberCoinAddressInList() {
+ //获取用户ID
+ Long memberId = LoginUserUtils.getAppLoginUser().getId();
+
+ Map<String, Object> columnMap = new HashMap<>();
+ columnMap.put("member_id", memberId);
+ List<MemberCoinAddressInEntity> selectByMap = memberCoinAddressInDao.selectByMap(columnMap );
+ List<MemberCoinAddressInListVo> arrayList = new ArrayList<>();
+ if (CollUtil.isNotEmpty(selectByMap)) {
+ for (MemberCoinAddressInEntity memberCoinAddressInEntity : selectByMap) {
+ MemberCoinAddressInListVo memberCoinAddressInListVo = new MemberCoinAddressInListVo();
+ memberCoinAddressInListVo.setId(memberCoinAddressInEntity.getId());
+ memberCoinAddressInListVo.setAccount(memberCoinAddressInEntity.getAccount());
+ memberCoinAddressInListVo.setContent(memberCoinAddressInEntity.getContent());
+ arrayList.add(memberCoinAddressInListVo);
+ }
+ }
+ return Result.ok(arrayList);
+ }
}
--
Gitblit v1.9.1