From 650d73c83bf3fefb2c90284639d6b5e706637bcd Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sun, 21 Jul 2024 15:40:57 +0800
Subject: [PATCH] 逻辑

---
 src/main/java/cc/mrbird/febs/job/ProfitDailyJob.java                      |   12 +++++++++---
 src/main/java/cc/mrbird/febs/dapp/mapper/DappStorageMapper.java           |    2 ++
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java |   11 +++++++----
 src/main/resources/mapper/dapp/DappStorageMapper.xml                      |   12 ++++++++++++
 4 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/DappStorageMapper.java b/src/main/java/cc/mrbird/febs/dapp/mapper/DappStorageMapper.java
index 91abcc1..06e4b39 100644
--- a/src/main/java/cc/mrbird/febs/dapp/mapper/DappStorageMapper.java
+++ b/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);
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
index 43e3584..3283187 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
+++ b/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;
                 }
diff --git a/src/main/java/cc/mrbird/febs/job/ProfitDailyJob.java b/src/main/java/cc/mrbird/febs/job/ProfitDailyJob.java
index 04c7d37..41fb610 100644
--- a/src/main/java/cc/mrbird/febs/job/ProfitDailyJob.java
+++ b/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;
                 }
diff --git a/src/main/resources/mapper/dapp/DappStorageMapper.xml b/src/main/resources/mapper/dapp/DappStorageMapper.xml
index d34d01a..bf92e07 100644
--- a/src/main/resources/mapper/dapp/DappStorageMapper.xml
+++ b/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 &gt;= #{startTime}
+        order by create_time desc
+    </select>
+
+
+
     <select id="selectAmountByDesc" resultType="cc.mrbird.febs.dapp.entity.DappStorage">
         select
             *

--
Gitblit v1.9.1