From 113622491e3ecbbad9abcc362dcc4d070f382fe0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 09 Jun 2023 10:47:55 +0800
Subject: [PATCH] twoCoin项目修改

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java |   30 +++++++++++++++++++++++++-----
 1 files changed, 25 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..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,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);
@@ -558,6 +562,20 @@
         );
         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);
     }
 
@@ -626,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