From 0e8fd65e0a369f6326e844d7cb0ad0f99f49ab44 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 21 Jun 2023 10:03:26 +0800
Subject: [PATCH] 特定的294L用户转andao不扣手续费
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 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..b029950 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,22 @@
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));
+
+ /**
+ * 今日涨幅
+ */
+ //最新的一条记录
+ DappAKlineEntity dappAKlineNow = dappAKlineMapper.selectOneByType();
+ BigDecimal closePriceNow = dappAKlineNow.getClosePrice();
+ //拿日线的最后一条数据
+ DappAKlineEntity dappAKlineStart = dappAKlineMapper.selectDayByType();
+ BigDecimal closePriceStart = dappAKlineStart.getClosePrice();
+
+ BigDecimal subtract = closePriceNow.subtract(closePriceStart);
+ BigDecimal bigDecimal = subtract.divide(closePriceStart, 4, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_DOWN);
+ dappMemberInfoVo.setTodayIncrease(bigDecimal);
return new FebsResponse().success().data(dappMemberInfoVo);
}
@@ -585,7 +605,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 +631,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));
@@ -624,12 +644,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