From 4bcedc984948c3c757d6b155e019174ef2fe9a0a Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Fri, 14 Jun 2024 14:41:17 +0800 Subject: [PATCH] 星级矩阵 --- src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 119 ++++++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 88 insertions(+), 31 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java index ce7042d..1350b7f 100644 --- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java @@ -1,6 +1,5 @@ package cc.mrbird.febs.dapp.service.impl; -import cc.mrbird.febs.common.configure.i18n.MessageSourceUtils; import cc.mrbird.febs.common.contants.AppContants; import cc.mrbird.febs.common.entity.QueryRequest; import cc.mrbird.febs.common.exception.FebsException; @@ -8,20 +7,22 @@ import cc.mrbird.febs.common.utils.LoginUserUtil; import cc.mrbird.febs.common.utils.RedisUtils; import cc.mrbird.febs.common.utils.ShareCodeUtil; -import cc.mrbird.febs.dapp.chain.ChainEnum; import cc.mrbird.febs.dapp.chain.ChainService; import cc.mrbird.febs.dapp.chain.ContractChainService; import cc.mrbird.febs.dapp.dto.ApproveDto; import cc.mrbird.febs.dapp.dto.ConnectDto; import cc.mrbird.febs.dapp.dto.PriceSettingDto; -import cc.mrbird.febs.dapp.dto.TeamListDto; import cc.mrbird.febs.dapp.entity.*; +import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum; import cc.mrbird.febs.dapp.mapper.*; import cc.mrbird.febs.dapp.service.DappMemberService; +import cc.mrbird.febs.dapp.vo.AdminSystemFeeVo; import cc.mrbird.febs.dapp.vo.TeamListVo; import cc.mrbird.febs.system.entity.User; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -37,7 +38,7 @@ import java.util.Map; /** - * @author + * @author * @date 2022-03-17 **/ @Service @@ -49,7 +50,10 @@ private final DappWalletMineDao dappWalletMineDao; private final DappTransferRecordDao dappTransferRecordDao; private final RedisUtils redisUtils; + + private final DappAchieveMemberTreeDao dappAchieveMemberTreeDao; private final DataDictionaryCustomMapper dataDictionaryCustomMapper; + private final DappFundFlowDao dappFundFlowDao; @Override @Transactional(rollbackFor = Exception.class) @@ -78,7 +82,7 @@ member.setInviteId(ShareCodeUtil.toSerialCode(member.getId())); member.setRefererId(approveDto.getRefererId()); - if (StrUtil.isNotBlank(approveDto.getRefererId())){ + if (StrUtil.isNotBlank(approveDto.getRefererId())) { boolean flag = false; String parentId = approveDto.getRefererId(); String ids = ""; @@ -94,7 +98,7 @@ break; } parentId = parentMember.getRefererId(); - if(StringUtils.isBlank(parentId)){ + if (StringUtils.isBlank(parentId)) { break; } if (parentMember.getRefererId().equals(parentMember.getInviteId())) { @@ -132,16 +136,18 @@ throw new FebsException("recommender is not exist"); } - List<DappMemberEntity> child = dappMemberDao.selectChildMemberDirectOrNot(connectDto.getInviteId(), 1); - if (child.size() == 6) { - throw new FebsException("Invite Code is Invalid"); - } +// List<DappMemberEntity> child = dappMemberDao.selectChildMemberDirectOrNot(connectDto.getInviteId(), 1, null); +// if (child.size() == 6) { +// throw new FebsException("Invite Code is Invalid"); +// } + } else { + connectDto.setInviteId(null); } - member = insertMember(connectDto.getAddress(), null); + member = insertMember(connectDto.getAddress(), connectDto.getInviteId()); } String key = LoginUserUtil.getLoginKey(connectDto.getAddress(), connectDto.getNonce(), connectDto.getSign()); - redisUtils.set(connectDto.getAddress(), member); + redisUtils.hset(AppContants.REDIS_KEY_MEMBER_INFO, connectDto.getAddress(), member); Map<Object, Object> keys = redisUtils.hmget(AppContants.REDIS_KEY_SIGN); if (keys == null) { @@ -258,7 +264,7 @@ @Override public IPage<DappTransferRecordEntity> selectTransferInPage(DappTransferRecordEntity transfer, QueryRequest request) { Page<DappTransferRecordEntity> page = new Page<>(request.getPageNum(), request.getPageSize()); - return dappTransferRecordDao.selectInPage(transfer,page); + return dappTransferRecordDao.selectInPage(transfer, page); } @Override @@ -280,9 +286,7 @@ member.setAddress(address); member.setChainType(chainType); member.setAccountType(accountType); - member.setActiveStatus(1); - member.setBalance(ChainService.getInstance(ChainEnum.BSC_TFC.name()).balanceOf(address)); - member.setUsdtBalance(ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf(address)); + member.setActiveStatus(2); dappMemberDao.insert(member); @@ -290,19 +294,22 @@ walletCoin.setMemberId(member.getId()); dappWalletCoinDao.insert(walletCoin); + DappWalletMineEntity walletMine = new DappWalletMineEntity(); + walletMine.setMemberId(member.getId()); + dappWalletMineDao.insert(walletMine); + if (StrUtil.isEmpty(refererId)) { refererId = "0"; // 若没有推荐人,则直接激活 - member.setActiveStatus(1); + member.setActiveStatus(2); } member.setInviteId(ShareCodeUtil.toSerialCode(member.getId())); member.setRefererId(refererId); - if (StrUtil.isNotBlank(refererId)){ + if (StrUtil.isNotBlank(refererId)) { boolean flag = false; String parentId = refererId; String ids = ""; - String feeProfitIds = ""; while (!flag && StringUtils.isNotBlank(parentId)) { if (StrUtil.isBlank(ids)) { @@ -311,18 +318,12 @@ ids += ("," + parentId); } - if (StrUtil.isBlank(feeProfitIds)) { - feeProfitIds += parentId; - } else { - feeProfitIds += ("," + parentId); - } - DappMemberEntity parentMember = dappMemberDao.selectMemberInfoByInviteId(parentId); if (parentMember == null) { break; } parentId = parentMember.getRefererId(); - if(StringUtils.isBlank(parentId) || "0".equals(parentId)){ + if (StringUtils.isBlank(parentId) || "0".equals(parentId)) { break; } if (parentMember.getRefererId().equals(parentMember.getInviteId())) { @@ -330,7 +331,6 @@ } } member.setRefererIds(ids); - member.setFeeProfitIds(feeProfitIds); } dappMemberDao.updateById(member); @@ -338,10 +338,67 @@ } @Override - public List<TeamListVo> findTeamList(TeamListDto teamListDto) { + public TeamListVo findTeamList() { DappMemberEntity member = LoginUserUtil.getAppUser(); - Page<TeamListDto> page = new Page<>(teamListDto.getPageNum(), teamListDto.getPageSize()); - teamListDto.setInviteId(member.getInviteId()); - return dappMemberDao.selectTeamListInPage(teamListDto, page).getRecords(); + +// DappAchieveMemberTreeEntity topNode = dappAchieveMemberTreeDao.selectNodeByDeep(member.getId(), 1); +// if (topNode == null) { +// return null; +// } +// return buildTeamMatrix(topNode); + QueryWrapper<DappFundFlowEntity> objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("member_id", member.getId()); + objectQueryWrapper.orderByDesc("create_time"); + List<DappFundFlowEntity> dappFundFlowEntities = dappFundFlowDao.selectList(objectQueryWrapper); + if(ObjectUtil.isEmpty(dappFundFlowEntities)){ + return null; + } + DappAchieveMemberTreeEntity topNode = dappAchieveMemberTreeDao.selectNodeByDeep(dappFundFlowEntities.get(0).getId(), 1); + if (topNode == null) { + return null; + } + return buildTeamMatrix(topNode); + } + + @Override + public void setSystemFee(AdminSystemFeeVo adminSystemFeeVo) { + String rebatePercent = adminSystemFeeVo.getRebatePercent(); + DataDictionaryCustom rebateDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.REBATE_PERCENT.getType(), DataDictionaryEnum.REBATE_PERCENT.getCode()); + rebateDic.setValue(rebatePercent); + dataDictionaryCustomMapper.updateById(rebateDic); + + String serviceFee = adminSystemFeeVo.getServiceFee(); + DataDictionaryCustom serviceFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WITHDRAW_SERVICE_FEE.getType(), DataDictionaryEnum.WITHDRAW_SERVICE_FEE.getCode()); + serviceFeeDic.setValue(serviceFee); + dataDictionaryCustomMapper.updateById(serviceFeeDic); + + String memberFee = adminSystemFeeVo.getMemberFee(); + DataDictionaryCustom memberFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.MEMBER_FEE.getType(), DataDictionaryEnum.MEMBER_FEE.getCode()); + memberFeeDic.setValue(memberFee); + dataDictionaryCustomMapper.updateById(memberFeeDic); + + String symbolPrice = adminSystemFeeVo.getSymbolPrice(); + DataDictionaryCustom symbolPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SYMBOL_PRICE.getType(), DataDictionaryEnum.SYMBOL_PRICE.getCode()); + symbolPriceDic.setValue(symbolPrice); + dataDictionaryCustomMapper.updateById(symbolPriceDic); + } + + public TeamListVo buildTeamMatrix(DappAchieveMemberTreeEntity node) { + List<DappAchieveMemberTreeEntity> childNodes = dappAchieveMemberTreeDao.selectMatrixChildNode(node.getTopNode(), node.getTreeNode()); + + TeamListVo teamListVo = new TeamListVo(); + teamListVo.setName(node.getInviteId()); + teamListVo.setHasMoney(node.getHasMoney()); + + if (CollUtil.isEmpty(childNodes)) { + return teamListVo; + } + + List<TeamListVo> list = new ArrayList<>(); + for (DappAchieveMemberTreeEntity childNode : childNodes) { + list.add(buildTeamMatrix(childNode)); + } + teamListVo.setChildren(list); + return teamListVo; } } -- Gitblit v1.9.1