From ad3e1aee8d80d7534ad777a16255fed922fc5dde Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 05 Jun 2023 14:39:39 +0800
Subject: [PATCH] twoCoin项目修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 10 +++++++---
1 files changed, 7 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 da46f1b..1227838 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,6 +515,10 @@
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);
@@ -587,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)){
@@ -613,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));
@@ -631,7 +635,7 @@
dappUsdtPerkEntity.setMemberId(child.getId());
dappUsdtPerkEntityMapper.insert(dappUsdtPerkEntity);
}
- 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