From 97946d338b1bca979b27e3fe747967da90bcc283 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 19 May 2023 18:05:58 +0800
Subject: [PATCH] twoCoin项目修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 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 f05d634..209b953 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
@@ -62,6 +62,7 @@
private final DappFundFlowDao dappFundFlowDao;
private final DappNodeOrderMapper dappNodeOrderMapper;
+ private final DappMemberNodeMapper dappMemberNodeMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -209,15 +210,21 @@
if(CollUtil.isNotEmpty(records)){
for(DappMemberEntity memberEntity : records){
Long memberId = memberEntity.getId();
-
- DappSystemProfit dappSystemProfit = dappSystemProfitDao.selectByMemberIdAndState(memberId,DappSystemProfit.STATE_IN);
- memberEntity.setSystemProfitId(ObjectUtil.isEmpty(dappSystemProfit) ? 0L : dappSystemProfit.getId());
+ //直推收益
BigDecimal directProfit = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(memberId,3,2);
memberEntity.setDirectProfit(directProfit);
- BigDecimal levelProfit = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(memberId,4,2);
- memberEntity.setLevelProfit(levelProfit);
- BigDecimal luckyProfit = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(memberId,7,2);
- memberEntity.setLuckyProfit(luckyProfit);
+ //购买节点数量
+ List<DappMemberNodeVo> dappMemberNodeVos = dappMemberNodeMapper.selectListByMemberId(memberId);
+ memberEntity.setMemberNodeCnt(CollUtil.isEmpty(dappMemberNodeVos) ? 0 : dappMemberNodeVos.size());
+
+ BigDecimal memberNodeSumPrice = BigDecimal.ZERO;
+ if(CollUtil.isNotEmpty(dappMemberNodeVos)){
+ for(DappMemberNodeVo dappMemberNodeVo : dappMemberNodeVos){
+ BigDecimal nodePrice = dappMemberNodeVo.getNodePrice();
+ memberNodeSumPrice = memberNodeSumPrice.add(nodePrice);
+ }
+ }
+ memberEntity.setMemberNodeSumPrice(memberNodeSumPrice.setScale(8,BigDecimal.ROUND_DOWN));
}
}
return dappMemberEntityIPage;
@@ -399,6 +406,12 @@
DataDictionaryCustom symbolPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SYMBOL_PRICE.getType(), DataDictionaryEnum.SYMBOL_PRICE.getCode());
symbolPriceDic.setValue(symbolPrice);
dataDictionaryCustomMapper.updateById(symbolPriceDic);
+
+ String directProfit = adminSystemFeeVo.getDirectProfit();
+ DataDictionaryCustom directProfitDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.DIRECT_PROFIT.getType(), DataDictionaryEnum.DIRECT_PROFIT.getCode());
+ directProfitDic.setValue(directProfit);
+ dataDictionaryCustomMapper.updateById(directProfitDic);
}
@Override
@@ -483,6 +496,26 @@
return new FebsResponse().success().data(dappNodeOrderVos);
}
+ @Override
+ public FebsResponse getMemberNode() {
+ DappMemberEntity member = LoginUserUtil.getAppUser();
+ List<DappMemberNodeVo> dappMemberNodeVos = dappMemberNodeMapper.selectListByMemberId(member.getId());
+ return new FebsResponse().success().data(dappMemberNodeVos);
+ }
+
+ @Override
+ public FebsResponse getMemberInfo() {
+ DappMemberEntity member = LoginUserUtil.getAppUser();
+ DappMemberInfoVo dappMemberInfoVo = dappMemberDao.selectByMemberId(member.getId());
+ return new FebsResponse().success().data(dappMemberInfoVo);
+ }
+
+ @Override
+ public IPage<DappMemberNodeVo> getMemberNodeInfo(DappMemberEntity dappMemberEntity, QueryRequest request) {
+ Page<DappMemberNodeVo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ return dappMemberNodeMapper.findMemberNodeInPage(page, dappMemberEntity);
+ }
+
public TeamListVo buildTeamMatrix(Long memberId) {
DappMemberEntity member = dappMemberDao.selectById(memberId);
TeamListVo teamListVo = new TeamListVo();
--
Gitblit v1.9.1