From b3472526ffb687e65aeda0352aad70d2d3442dfd Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Jun 2023 15:53:54 +0800
Subject: [PATCH] twoCoin项目修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 16 +++++++++++-----
1 files changed, 11 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 653ad14..902b803 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);
@@ -626,12 +630,14 @@
myInviteChildInfoVo.setAddress(child.getAddress());
myInviteChildInfoVo.setAccountType(child.getAccountType());
DappUsdtPerkEntity childUsdtPerkEntity = dappUsdtPerkEntityMapper.selectByMemberId(child.getId());
- if(ObjectUtil.isEmpty(dappUsdtPerkEntity)){
- dappUsdtPerkEntity = new DappUsdtPerkEntity();
- dappUsdtPerkEntity.setMemberId(child.getId());
- dappUsdtPerkEntityMapper.insert(dappUsdtPerkEntity);
+// BigDecimal achieveAmountByMemberId = dappUsdtPerkEntityMapper.selectAchieveAmountByMemberId(child.getId());
+ if(ObjectUtil.isEmpty(childUsdtPerkEntity)){
+ childUsdtPerkEntity = new DappUsdtPerkEntity();
+ childUsdtPerkEntity.setMemberId(child.getId());
+ dappUsdtPerkEntityMapper.insert(childUsdtPerkEntity);
}
- 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