src/main/java/cc/mrbird/febs/dapp/mapper/DappStorageMapper.java
@@ -18,6 +18,8 @@ List<DappStorage> selectListByDate( @Param("date") Date date); List<DappStorage> selectListByDateFiveToFiver(@Param("startTime")DateTime startTime); DappStorage selectAmountByDesc(@Param("date") Date date,@Param("offset")int offset,@Param("count")int count); DappStorage selectOneByCreateTimeDesc(@Param("offset")int offset,@Param("count")int count); src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -820,12 +820,15 @@ startTimeStr = DateUtil.formatDate(DateUtil.offsetDay(new Date(), -1)) + " 17:00:00"; } DateTime startTime = DateUtil.parseDateTime(startTimeStr); List<DappMemberEntity> dappMemberEntityList = dappMemberDao.selectListByDateFiveToFiver(startTime); // List<DappMemberEntity> dappMemberEntityList = dappMemberDao.selectListByDateFiveToFiver(startTime); List<DappStorage> dappStorages = dappStorageMapper.selectListByDateFiveToFiver(startTime); Set<Long> collect = dappStorages.stream().map(DappStorage::getMemberId).collect(Collectors.toSet()); // List<DappMemberEntity> dappMemberEntityList = dappMemberDao.selectListByDate(new Date()); if(CollUtil.isNotEmpty(dappMemberEntityList)){ for(DappMemberEntity member : dappMemberEntityList){ if(CollUtil.isNotEmpty(collect)){ for(Long memberId : collect){ DappMemberEntity member = dappMemberDao.selectById(memberId); if(StrUtil.isEmpty(member.getRefererId())){ continue; } src/main/java/cc/mrbird/febs/job/ProfitDailyJob.java
@@ -279,10 +279,16 @@ HashMap<Long, BigDecimal> map = new HashMap<>(); DateTime startTime = DateUtil.offsetHour(new Date(), -24); List<DappMemberEntity> dappMemberEntityList = dappMemberDao.selectListByDateFiveToFiver(startTime); // DateTime startTime = DateUtil.parseDateTime(startTimeStr); // List<DappMemberEntity> dappMemberEntityList = dappMemberDao.selectListByDateFiveToFiver(startTime); if(CollUtil.isNotEmpty(dappMemberEntityList)){ for(DappMemberEntity member : dappMemberEntityList){ List<DappStorage> dappStorages = dappStorageMapper.selectListByDateFiveToFiver(startTime); Set<Long> collect = dappStorages.stream().map(DappStorage::getMemberId).collect(Collectors.toSet()); // List<DappMemberEntity> dappMemberEntityList = dappMemberDao.selectListByDate(new Date()); if(CollUtil.isNotEmpty(collect)){ for(Long memberId : collect){ DappMemberEntity member = dappMemberDao.selectById(memberId); if(StrUtil.isEmpty(member.getRefererId())){ continue; } src/main/resources/mapper/dapp/DappStorageMapper.xml
@@ -38,6 +38,18 @@ </select> <select id="selectListByDateFiveToFiver" resultType="cc.mrbird.febs.dapp.entity.DappStorage"> select * from dapp_storage where create_time >= #{startTime} order by create_time desc </select> <select id="selectAmountByDesc" resultType="cc.mrbird.febs.dapp.entity.DappStorage"> select *