From 855b8a7835bfffd7e81ef5fb2d9e6bad133136c9 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Sat, 06 Jul 2024 23:02:04 +0800 Subject: [PATCH] 逻辑 --- src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 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 06caa27..3e89f6a 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 @@ -410,7 +410,7 @@ List<Long> collectDirect = directCntAva.stream().map(DappMemberEntity::getId).collect(Collectors.toList()); QueryWrapper<DappStorage> storageQueryWrapper = new QueryWrapper<>(); storageQueryWrapper.in("member_id",collectDirect); - storageQueryWrapper.eq("state",1); +// storageQueryWrapper.eq("state",1); List<DappStorage> dappStoragesDirect = dappStorageMapper.selectList(storageQueryWrapper); BigDecimal directAchieve = dappStoragesDirect.stream() .map(DappStorage::getAmount) // 映射amount到流中 @@ -425,11 +425,11 @@ List<DappMemberEntity> teamCntAva = teamMembers.stream().filter(dappMemberEntity -> dappMemberEntity.getActiveStatus() == 1).collect(Collectors.toList()); teamUpVo.setTeamCntAva(CollUtil.isEmpty(teamCntAva) ? 0 : teamCntAva.size()); - if(CollUtil.isNotEmpty(directCntAva)){ + if(CollUtil.isNotEmpty(teamCntAva)){ List<Long> collectTeam = teamCntAva.stream().map(DappMemberEntity::getId).collect(Collectors.toList()); QueryWrapper<DappStorage> collectTeamWrapper = new QueryWrapper<>(); collectTeamWrapper.in("member_id",collectTeam); - collectTeamWrapper.eq("state",1); +// collectTeamWrapper.eq("state",1); List<DappStorage> dappStoragesTeam = dappStorageMapper.selectList(collectTeamWrapper); BigDecimal teamAchieve = dappStoragesTeam.stream() .map(DappStorage::getAmount) // 映射amount到流中 @@ -470,7 +470,7 @@ if(CollUtil.isNotEmpty(collectTeam)){ QueryWrapper<DappStorage> collectTeamWrapper = new QueryWrapper<>(); collectTeamWrapper.in("member_id",collectTeam); - collectTeamWrapper.eq("state",1); +// collectTeamWrapper.eq("state",1); List<DappStorage> dappStoragesTeam = dappStorageMapper.selectList(collectTeamWrapper); BigDecimal teamAchieve = dappStoragesTeam.stream() .map(DappStorage::getAmount) // 映射amount到流中 -- Gitblit v1.9.1