src/main/java/cc/mrbird/febs/dapp/mapper/DappStorageMapper.java
@@ -19,5 +19,7 @@ DappStorage selectAmountByDesc(@Param("date") Date date,@Param("offset")int offset,@Param("count")int count); DappStorage selectAmountByAmountDesc(@Param("offset")int offset,@Param("count")int count); IPage<DappStorage> selectListInPage(@Param("record")DappStorage dappStorage, Page<DappStorage> page); } 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到流中 @@ -429,7 +429,7 @@ 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到流中 src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
@@ -1009,7 +1009,7 @@ List<Long> collect = direct.stream().map(DappMemberEntity::getId).collect(Collectors.toList()); QueryWrapper<DappStorage> storageQueryWrapper = new QueryWrapper<>(); storageQueryWrapper.in("member_id",collect); storageQueryWrapper.eq("state",1); // storageQueryWrapper.eq("state",1); List<DappStorage> dappStorages = dappStorageMapper.selectList(storageQueryWrapper); if(CollUtil.isEmpty(dappStorages)){ continue; src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -397,6 +397,13 @@ throw new FebsException("存储数量必须是"+bigDecimal+"的整数倍"); } DappStorage dappStorage = dappStorageMapper.selectAmountByAmountDesc(0, 1); if(ObjectUtil.isNotEmpty(dappStorage)){ if(amount.compareTo(dappStorage.getAmount()) >= 0){ throw new FebsException("存储数量必须大于:"+dappStorage.getAmount()); } } if (ObjectUtil.isEmpty(transferDto.getId())) { DappFundFlowEntity fundFlow = new DappFundFlowEntity( src/main/resources/mapper/dapp/DappStorageMapper.xml
@@ -49,6 +49,16 @@ limit #{offset},#{count} </select> <select id="selectAmountByAmountDesc" resultType="cc.mrbird.febs.dapp.entity.DappStorage"> select * from dapp_storage order by amount desc limit #{offset},#{count} </select> <select id="selectListInPage" resultType="cc.mrbird.febs.dapp.entity.DappStorage"> select a.*,