From 2141ec9070c16bea349ddf49a098a4b677e0b508 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 17 May 2024 09:42:32 +0800
Subject: [PATCH] 滑点监控
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 45 +++++++++++++++++----------------------------
1 files changed, 17 insertions(+), 28 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 8d0d904..7f05ec5 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
@@ -3,13 +3,11 @@
import cc.mrbird.febs.common.contants.AppContants;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
-import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.FebsUtil;
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.common.utils.ShareCodeUtil;
-import cc.mrbird.febs.dapp.chain.ChainEnum;
import cc.mrbird.febs.dapp.chain.ChainService;
import cc.mrbird.febs.dapp.chain.ContractChainService;
import cc.mrbird.febs.dapp.dto.ApproveDto;
@@ -25,18 +23,15 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
-import okhttp3.*;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.io.IOException;
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
@@ -378,37 +373,31 @@
.collect(Collectors.toList());
Set<Long> collect1 = filteredList.stream().map(DappAchieve::getMemberId).collect(Collectors.toSet());
teamListVo.setAvaCount(CollUtil.isEmpty(collect1) ? 0 : collect1.size());
-
-// BigDecimal teamAchieveMemberSum = dappAchieveSumList.stream().map(DappAchieve::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal teamAchieveMemberSum = dappAchieveSumList.stream().map(item-> item.getAmount().multiply(item.getPrice())).reduce(BigDecimal.ZERO, BigDecimal::add);
-// BigDecimal teamAchieveMemberSum = BigDecimal.ZERO;
-// if(CollUtil.isNotEmpty(dappAchieveSumList)){
-// for(DappAchieve dappAchieve : dappAchieveSumList){
-// BigDecimal price = dappAchieve.getPrice();
-// BigDecimal amount = dappAchieve.getAmount();
-// teamAchieveMemberSum = teamAchieveMemberSum.add(price.multiply(amount)).setScale(2,BigDecimal.ROUND_DOWN);
-// }
-// }
- teamListVo.setTeamAmount(teamAchieveMemberSum);
-
BigDecimal avaAmount = filteredList.stream().map(DappAchieve::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
-// BigDecimal avaAmount = filteredList.stream().map(item-> item.getAmount().multiply(item.getPrice())).reduce(BigDecimal.ZERO, BigDecimal::add);
-// BigDecimal avaAmount = BigDecimal.ZERO;
-// if(CollUtil.isNotEmpty(filteredList)){
-// for(DappAchieve dappAchieve : filteredList){
-// BigDecimal price = dappAchieve.getPrice();
-// BigDecimal amount = dappAchieve.getAmount();
-// avaAmount = avaAmount.add(price.multiply(amount)).setScale(2,BigDecimal.ROUND_DOWN);
-// }
-// }
teamListVo.setAvaAmount(avaAmount);
}else{
teamListVo.setAvaCount(0);
- teamListVo.setTeamAmount(BigDecimal.ZERO);
teamListVo.setAvaAmount(BigDecimal.ZERO);
}
+ List<DappMemberEntity> dappMemberEntitiesAva = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 1);
+ if(CollUtil.isNotEmpty(dappMemberEntitiesAva)){
+ List<Long> collect = dappMemberEntitiesAva.stream().map(DappMemberEntity::getId).collect(Collectors.toList());
+ QueryWrapper<DappAchieve> queryWrapper = new QueryWrapper<>();
+ queryWrapper.in("member_id",collect);
+ List<DappAchieve> dappAchieveSumList = dappAchieveMapper.selectList(queryWrapper);
+ if(CollUtil.isNotEmpty(dappAchieveSumList)){
+ BigDecimal teamAchieveMemberSum = dappAchieveSumList.stream().map(item-> item.getAmount().multiply(item.getPrice())).reduce(BigDecimal.ZERO, BigDecimal::add);
+ teamListVo.setTeamAmount(teamAchieveMemberSum);
+ }else{
+ teamListVo.setTeamAmount(BigDecimal.ZERO);
+ }
+ }else{
+ teamListVo.setTeamAmount(BigDecimal.ZERO);
+ }
+
+
teamListVo.setBalance(member.getBalance().setScale(2,BigDecimal.ROUND_DOWN));
teamListVo.setUsdtBalance(member.getUsdtBalance().setScale(2,BigDecimal.ROUND_DOWN));
--
Gitblit v1.9.1