From 6b090477bc4882144114a0fc2b94532e0e87aa0e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 30 May 2023 11:45:43 +0800
Subject: [PATCH] twoCoin项目修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 95 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 92 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 ce24af0..b2aefe8 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
@@ -12,6 +12,7 @@
import cc.mrbird.febs.dapp.dto.*;
import cc.mrbird.febs.dapp.entity.*;
import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum;
+import cc.mrbird.febs.dapp.enumerate.FundFlowEnum;
import cc.mrbird.febs.dapp.enumerate.PoolEnum;
import cc.mrbird.febs.dapp.mapper.*;
import cc.mrbird.febs.dapp.service.DappMemberService;
@@ -135,11 +136,14 @@
DappMemberEntity member = dappMemberDao.selectByAddress(connectDto.getAddress(), null);
if (member == null) {
+ String referenceID = null;
if (!"asdf4321".equals(connectDto.getInviteId())) {
- DappMemberEntity parent = dappMemberDao.selectMemberInfoByInviteId(connectDto.getInviteId());
+// DappMemberEntity parent = dappMemberDao.selectMemberInfoByInviteId(connectDto.getInviteId());
+ DappMemberEntity parent = dappMemberDao.selectByAddress(connectDto.getInviteId(), null);
if (parent == null) {
throw new FebsException("recommender is not exist");
}
+ referenceID = parent.getInviteId();
// List<DappMemberEntity> child = dappMemberDao.selectChildMemberDirectOrNot(connectDto.getInviteId(), 1, null);
// if (child.size() == 6) {
@@ -148,7 +152,7 @@
} else {
connectDto.setInviteId(null);
}
- member = insertMember(connectDto.getAddress(), connectDto.getInviteId());
+ member = insertMember(connectDto.getAddress(), referenceID);
//升级用户的代理等级
// DappMemberEntity dappMemberEntity = dappMemberDao.selectMemberInfoByInviteId(connectDto.getInviteId());
// chainProducer.sendAgentUpMsg(dappMemberEntity.getId());
@@ -510,6 +514,23 @@
public FebsResponse getMemberInfo() {
DappMemberEntity member = LoginUserUtil.getAppUser();
DappMemberInfoVo dappMemberInfoVo = dappMemberDao.selectByMemberId(member.getId());
+
+ BigDecimal amountPerkTotal = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(member.getId(), FundFlowEnum.MEMBER_AMOUNT_PERK_TOTAL.getCode(), 2);
+ dappMemberInfoVo.setAmountPerkTotal(amountPerkTotal);
+
+ DataDictionaryCustom ausdPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ PoolEnum.TRANSFER_A_AUSD_PERCENT.getType(),
+ PoolEnum.TRANSFER_A_AUSD_PERCENT.getCode()
+ );
+ BigDecimal ausdPercent = new BigDecimal(ausdPercentDic.getValue());
+ dappMemberInfoVo.setAusdtFee(ausdPercent);
+
+ DataDictionaryCustom aroundFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ PoolEnum.ANDAO_MEMBER_TO_MENBER_PERCENT.getType(),
+ PoolEnum.ANDAO_MEMBER_TO_MENBER_PERCENT.getCode()
+ );
+ BigDecimal aroundFee = new BigDecimal(aroundFeeDic.getValue());
+ dappMemberInfoVo.setAroundFee(aroundFee);
//ausd价格
DataDictionaryCustom ausdPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
PoolEnum.TRANSFER_A_AUSD_PRICE.getType(),
@@ -533,8 +554,15 @@
PoolEnum.COIN_A_PRICE.getType(),
PoolEnum.COIN_A_PRICE.getCode()
);
- dappMemberInfoVo.setCoinAPrice(ObjectUtil.isEmpty(coinAPriceDic) ? new BigDecimal("1") : new BigDecimal(coinAPriceDic.getValue()));
+ dappMemberInfoVo.setCoinAPrice((ObjectUtil.isEmpty(coinAPriceDic) ? new BigDecimal("1") : new BigDecimal(coinAPriceDic.getValue())).setScale(12,BigDecimal.ROUND_DOWN));
return new FebsResponse().success().data(dappMemberInfoVo);
+ }
+
+ public static void main(String[] args) {
+
+ BigDecimal bigDecimal = new BigDecimal(1).setScale(10, BigDecimal.ROUND_DOWN);
+ System.out.println(bigDecimal);
+
}
@Override
@@ -612,6 +640,67 @@
return myInviteInfoVo;
}
+ @Override
+ public FebsResponse getFundFlowInfo() {
+ DappMemberEntity member = LoginUserUtil.getAppUser();
+ Long memberId = member.getId();
+ FundFlowInfoVo fundFlowInfoVo = new FundFlowInfoVo();
+ BigDecimal myDonateCnt = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(member.getId(),
+ FundFlowEnum.BUY_A_COIN.getCode(), 2);
+ fundFlowInfoVo.setMyDonateCnt(myDonateCnt.abs());
+ fundFlowInfoVo.setMyDonateCntNum(FundFlowEnum.BUY_A_COIN.getCode());
+
+ BigDecimal amountPerkTotal = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(member.getId(),
+ FundFlowEnum.MEMBER_AMOUNT_PERK_TOTAL.getCode(), 2);
+ fundFlowInfoVo.setAmountPerkTotal(amountPerkTotal.abs());
+ fundFlowInfoVo.setAmountPerkTotalNum(FundFlowEnum.MEMBER_AMOUNT_PERK_TOTAL.getCode());
+
+ DappUsdtPerkEntity dappUsdtPerkEntity = dappUsdtPerkEntityMapper.selectByMemberId(memberId);
+ fundFlowInfoVo.setAmountPerkAva(ObjectUtil.isEmpty(dappUsdtPerkEntity) ? BigDecimal.ZERO : dappUsdtPerkEntity.getAmount());
+
+ BigDecimal directAmount = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(memberId,
+ FundFlowEnum.DIRECT_A_PERCENT.getCode(), 2);
+ fundFlowInfoVo.setDirectAmount(directAmount);
+ fundFlowInfoVo.setDirectAmountNum(FundFlowEnum.DIRECT_A_PERCENT.getCode());
+
+ BigDecimal staticAmount = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(memberId,
+ FundFlowEnum.POOL_MEMBER_A_CNT.getCode(), 2);
+ fundFlowInfoVo.setStaticAmount(staticAmount);
+ fundFlowInfoVo.setStaticAmountNum(FundFlowEnum.POOL_MEMBER_A_CNT.getCode());
+
+ BigDecimal nodeAmount = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(memberId,
+ FundFlowEnum.NODE_A_PERCENT_TO_MEMBER.getCode(), 2);
+ fundFlowInfoVo.setNodeAmount(nodeAmount);
+ fundFlowInfoVo.setNodeAmountNum(FundFlowEnum.NODE_A_PERCENT_TO_MEMBER.getCode());
+
+ BigDecimal levelEqualAmount = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(memberId,
+ FundFlowEnum.DAO_5_NODE_EQUALS_PERK.getCode(), 2);
+ fundFlowInfoVo.setLevelEqualAmount(levelEqualAmount);
+ fundFlowInfoVo.setLevelEqualAmountNum(FundFlowEnum.DAO_5_NODE_EQUALS_PERK.getCode());
+
+ BigDecimal levelAmount = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(memberId,
+ FundFlowEnum.LEVEL_A_PERCENT_CNT_MEMBER.getCode(), 2);
+ fundFlowInfoVo.setLevelAmount(levelAmount);
+ fundFlowInfoVo.setLevelAmountNum(FundFlowEnum.LEVEL_A_PERCENT_CNT_MEMBER.getCode());
+
+ BigDecimal daoThreeAmount = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(memberId,
+ FundFlowEnum.DAO_3_NODE_PERK.getCode(), 2);
+ fundFlowInfoVo.setDaoThreeAmount(daoThreeAmount);
+ fundFlowInfoVo.setDaoThreeAmountNum(FundFlowEnum.DAO_3_NODE_PERK.getCode());
+
+ BigDecimal daoFourAmount = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(memberId,
+ FundFlowEnum.DAO_4_NODE_PERK.getCode(), 2);
+ fundFlowInfoVo.setDaoFourAmount(daoFourAmount);
+ fundFlowInfoVo.setDaoFourAmountNum(FundFlowEnum.DAO_4_NODE_PERK.getCode());
+
+ BigDecimal daoFiveAmount = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(memberId,
+ FundFlowEnum.DAO_5_NODE_PERK.getCode(), 2);
+ fundFlowInfoVo.setDaoFiveAmount(daoFiveAmount);
+ fundFlowInfoVo.setDaoFiveAmountNum(FundFlowEnum.DAO_5_NODE_PERK.getCode());
+
+ return new FebsResponse().success().data(fundFlowInfoVo);
+ }
+
/**
* 获取用户的大小区业绩
* @param memberId
--
Gitblit v1.9.1