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 | 92 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 86 insertions(+), 6 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 a6addc9..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
@@ -17,8 +17,11 @@
import com.xcong.excoin.common.system.service.CommonService;
import com.xcong.excoin.modules.coin.dao.MemberAccountMoneyChangeDao;
import com.xcong.excoin.modules.coin.dao.ZhiYaDao;
+import com.xcong.excoin.modules.coin.dao.ZhiYaRecordDao;
import com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange;
import com.xcong.excoin.modules.coin.entity.ZhiYaEntity;
+import com.xcong.excoin.modules.coin.entity.ZhiYaRecordEntity;
+import com.xcong.excoin.modules.coin.entity.ZhiYaTeam;
import com.xcong.excoin.modules.coin.parameter.vo.ZhiyaInfoVo;
import com.xcong.excoin.modules.member.dao.*;
import com.xcong.excoin.modules.member.entity.*;
@@ -39,6 +42,7 @@
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.web3j.abi.datatypes.Int;
import java.math.BigDecimal;
import java.util.ArrayList;
@@ -61,6 +65,9 @@
private MemberDao memberDao;
@Resource
+ private ZhiYaRecordDao zhiYaRecordDao;
+
+ @Resource
private MemberWalletAgentDao memberWalletAgentDao;
@Resource
@@ -71,6 +78,9 @@
@Resource
private MemberWalletCoinDao memberWalletCoinDao;
+
+ @Resource
+ private MemberCoinAddressInDao memberCoinAddressInDao;
@Resource
private ZhiYaDao zhiYaDao;
@@ -1031,12 +1041,82 @@
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
MemberEntity member = memberDao.selectById(memberId);
- Page<MemberTeamVo> page = new Page<>(memberTeamRecordsPageDto.getPageNum(), memberTeamRecordsPageDto.getPageSize());
- MemberEntity memberEntity = new MemberEntity();
- memberEntity.setId(memberId);
- memberEntity.setInviteId(member.getInviteId());
- IPage<MemberTeamVo> lists = memberDao.selectAllTeamByInviteIdInPage(page, memberEntity);
- return Result.ok(lists);
+ 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);
+ //直属会员
+ 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);
+ }
+ if(CollUtil.isNotEmpty(memberZhiShu)){
+ for(MemberEntity zhishu : memberZhiShu){
+ Long zhiShuMemberId = zhishu.getId();
+ ZhiYaTeam zhiYaTeam = memberDao.selectZhiYaTeamRecordByMemberId(zhiShuMemberId);
+ 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);
+
+ Long aLong = zhiYaRecordDao.selectSumZhiyaCntByMemberIdAndOrderStatus(zhiShuMemberId, 1);
+ Long rLong = zhiYaRecordDao.selectSumRewardCntByMemberId(zhiShuMemberId);
+ teamVo.setZhiyaCnt(new BigDecimal(aLong));
+ teamVo.setRewardCnt(new BigDecimal(rLong));
+ if(ObjectUtil.isNotEmpty(zhiYaTeam)){
+ teamVo.setZhiyaCnt((zhiYaTeam.getZhiyaCnt() == null ? BigDecimal.ZERO : zhiYaTeam.getZhiyaCnt()).add(new BigDecimal(aLong)));
+ teamVo.setRewardCnt(zhiYaTeam.getRewardCnt() == null ?BigDecimal.ZERO : zhiYaTeam.getRewardCnt().add(new BigDecimal(rLong)));
+ }
+ teamVos.add(teamVo);
+ }
+ memberTeamVo.setTeamVo(teamVos);
+ }
+ 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