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 | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 4358741..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,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)){
@@ -630,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