From 6bebd32b8a5b4ff9a9b32012a6f6d96a53dde5a2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 05 Jun 2023 17:04:05 +0800
Subject: [PATCH] twoCoin项目修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 efd2831..0aa3526 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
@@ -515,8 +515,13 @@
public FebsResponse getMemberInfo() {
DappMemberEntity member = LoginUserUtil.getAppUser();
DappMemberInfoVo dappMemberInfoVo = dappMemberDao.selectByMemberId(member.getId());
+ if(StrUtil.isNotEmpty(dappMemberInfoVo.getAccountType())){
+ String levelDescription = MemberLevelEnum.MEMBER.getLevelDescription(dappMemberInfoVo.getAccountType());
+ dappMemberInfoVo.setAccountType(levelDescription);
+ }
- BigDecimal amountPerkTotal = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(member.getId(), FundFlowEnum.MEMBER_AMOUNT_PERK_TOTAL.getCode(), 2);
+ BigDecimal amountPerkTotal = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(member.getId(),
+ FundFlowEnum.MEMBER_AMOUNT_PERK_TOTAL.getCode(), 2);
dappMemberInfoVo.setAmountPerkTotal(amountPerkTotal);
DataDictionaryCustom ausdPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
@@ -555,7 +560,8 @@
PoolEnum.COIN_A_PRICE.getType(),
PoolEnum.COIN_A_PRICE.getCode()
);
- dappMemberInfoVo.setCoinAPrice((ObjectUtil.isEmpty(coinAPriceDic) ? new BigDecimal("1") : new BigDecimal(coinAPriceDic.getValue())).setScale(12,BigDecimal.ROUND_DOWN));
+ dappMemberInfoVo.setCoinAPrice((ObjectUtil.isEmpty(coinAPriceDic) ? new BigDecimal("1") : new BigDecimal(coinAPriceDic.getValue()))
+ .setScale(12,BigDecimal.ROUND_DOWN));
return new FebsResponse().success().data(dappMemberInfoVo);
}
@@ -585,7 +591,7 @@
}else if(4 == type){
redisKey = AppContants.K_LINE_MONTH;
}else{
- redisKey = AppContants.K_LINE_HOUR;
+ redisKey = AppContants.K_LINE_NOW;
}
Object o = redisUtils.get(redisKey);
if(ObjectUtil.isNotEmpty(o)){
@@ -611,7 +617,7 @@
myInviteInfoVo.setMemberAchieve(dappUsdtPerkEntity.getAchieveAmount());
String refererId = dappMemberEntity.getRefererId();
DappMemberEntity parentMember = dappMemberDao.selectMemberInfoByInviteId(refererId);
- myInviteInfoVo.setReferenceAddress(parentMember.getAddress());
+ myInviteInfoVo.setReferenceAddress(ObjectUtil.isEmpty(parentMember) ? "-" : parentMember.getAddress());
HashMap<String, BigDecimal> maxMinAchieve = getMaxMinAchieve(memberId);
myInviteInfoVo.setMaxAchieve(maxMinAchieve.get(AppContants.MAXACHIEVE));
myInviteInfoVo.setMinAchieve(maxMinAchieve.get(AppContants.MINACHIEVE));
@@ -628,8 +634,12 @@
dappUsdtPerkEntity = new DappUsdtPerkEntity();
dappUsdtPerkEntity.setMemberId(child.getId());
dappUsdtPerkEntityMapper.insert(dappUsdtPerkEntity);
+ myInviteChildInfoVo.setMemberAchieve(BigDecimal.ZERO);
+ }else{
+ myInviteChildInfoVo.setMemberAchieve(childUsdtPerkEntity.getAchieveAmount());
}
- myInviteChildInfoVo.setMemberAchieve(childUsdtPerkEntity.getAchieveAmount());
+
+// myInviteChildInfoVo.setMemberAchieve(ObjectUtil.isEmpty(childUsdtPerkEntity.getAchieveAmount()) ? BigDecimal.ZERO : childUsdtPerkEntity.getAchieveAmount());
HashMap<String, BigDecimal> childMaxMinAchieve = getMaxMinAchieve(child.getId());
myInviteChildInfoVo.setMaxAchieve(childMaxMinAchieve.get(AppContants.MAXACHIEVE));
myInviteChildInfoVo.setMinAchieve(childMaxMinAchieve.get(AppContants.MINACHIEVE));
--
Gitblit v1.9.1