From 24ceb7b6168f04d1727ad1bbf4ee44d33a545cf4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 19 May 2023 10:12:38 +0800
Subject: [PATCH] twoCoin项目修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 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 78eb160..88c5b96 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
@@ -2,6 +2,7 @@
import cc.mrbird.febs.common.configure.i18n.MessageSourceUtils;
import cc.mrbird.febs.common.contants.AppContants;
+import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.FebsUtil;
@@ -59,6 +60,9 @@
private final DappSystemProfitDao dappSystemProfitDao;
private final ChainProducer chainProducer;
private final DappFundFlowDao dappFundFlowDao;
+
+ private final DappNodeOrderMapper dappNodeOrderMapper;
+ private final DappMemberNodeMapper dappMemberNodeMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -150,8 +154,8 @@
}
member = insertMember(connectDto.getAddress(), connectDto.getInviteId());
//升级用户的代理等级
- DappMemberEntity dappMemberEntity = dappMemberDao.selectMemberInfoByInviteId(connectDto.getInviteId());
- chainProducer.sendAgentUpMsg(dappMemberEntity.getId());
+// DappMemberEntity dappMemberEntity = dappMemberDao.selectMemberInfoByInviteId(connectDto.getInviteId());
+// chainProducer.sendAgentUpMsg(dappMemberEntity.getId());
}
String key = LoginUserUtil.getLoginKey(connectDto.getAddress(), connectDto.getNonce(), connectDto.getSign());
@@ -369,6 +373,9 @@
if(ObjectUtil.isEmpty(dappSystemProfit)){
return null;
}
+ //升级用户的代理等级
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectMemberInfoByInviteId(member.getRefererId());
+ chainProducer.sendAgentUpMsg(dappMemberEntity.getId());
return buildTeamMatrix(member.getId());
}
@@ -422,7 +429,7 @@
//实际投资人数
Integer selectCount = dappSystemProfitDao.selectCount(objectQueryWrapper);
int runPercentNum = memberCount - selectCount;
- runPercentNum = runPercentNum > 0 ? runPercentNum : 1;
+ runPercentNum = 5-runPercentNum > 0 ? 5-runPercentNum : 1;
apiRunListInfoVo.setRunPercent(new BigDecimal(runPercentNum).multiply(new BigDecimal(0.4)).setScale(BigDecimal.ROUND_DOWN,1));
// BigDecimal runPercent = new BigDecimal(selectCount).divide(new BigDecimal(memberCount), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100));
// apiRunListInfoVo.setRunPercent(runPercent);
@@ -471,6 +478,26 @@
return adminTeamInfoVoIPage;
}
+ @Override
+ public FebsResponse getNodeInfo() {
+ List<DappNodeOrderVo> dappNodeOrderVos = dappNodeOrderMapper.selectNodeOrderList();
+ 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);
+ }
+
public TeamListVo buildTeamMatrix(Long memberId) {
DappMemberEntity member = dappMemberDao.selectById(memberId);
TeamListVo teamListVo = new TeamListVo();
--
Gitblit v1.9.1