From b90204ae4fc53bf4bdc1c232aa4079e5d3e434f7 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 09 Jul 2024 21:47:16 +0800
Subject: [PATCH] 逻辑
---
src/main/java/cc/mrbird/febs/job/ProfitDailyJob.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/job/ProfitDailyJob.java b/src/main/java/cc/mrbird/febs/job/ProfitDailyJob.java
index 6161e8c..86c0686 100644
--- a/src/main/java/cc/mrbird/febs/job/ProfitDailyJob.java
+++ b/src/main/java/cc/mrbird/febs/job/ProfitDailyJob.java
@@ -173,7 +173,7 @@
BigDecimal everyAmount = daDanTotal.divide(new BigDecimal(count));
if(everyAmount.compareTo(BigDecimal.ZERO) > 0){
- List<DappStorage> dappStorageOne = dappStorageMapper.selectSumByAmountDesc(new Date(),0,1);
+ List<DappStorage> dappStorageOne = dappStorageMapper.selectSumByAmountDescFiveToFive(DateUtil.offsetHour(new Date(),-24),0,1);
if(CollUtil.isNotEmpty(dappStorageOne)){
BigDecimal multiply = everyAmount.multiply(new BigDecimal(oneCount));
dappSystemService.updateBalanceInsertFlow(
@@ -184,7 +184,7 @@
realAmount = realAmount.add(multiply);
}
- List<DappStorage> dappStorageTwo = dappStorageMapper.selectSumByAmountDesc(new Date(),1,1);
+ List<DappStorage> dappStorageTwo = dappStorageMapper.selectSumByAmountDescFiveToFive(DateUtil.offsetHour(new Date(),-24),1,1);
if(CollUtil.isNotEmpty(dappStorageTwo)){
BigDecimal multiply = everyAmount.multiply(new BigDecimal(twoCount));
dappSystemService.updateBalanceInsertFlow(
@@ -195,7 +195,7 @@
realAmount = realAmount.add(multiply);
}
- List<DappStorage> dappStorageThree = dappStorageMapper.selectSumByAmountDesc(new Date(),2,1);
+ List<DappStorage> dappStorageThree = dappStorageMapper.selectSumByAmountDescFiveToFive(DateUtil.offsetHour(new Date(),-24),2,1);
if(CollUtil.isNotEmpty(dappStorageThree)){
BigDecimal multiply = everyAmount.multiply(new BigDecimal(threeCount));
dappSystemService.updateBalanceInsertFlow(
@@ -206,7 +206,7 @@
realAmount = realAmount.add(multiply);
}
- List<DappStorage> dappStorageFour = dappStorageMapper.selectSumByAmountDesc(new Date(),3,1);
+ List<DappStorage> dappStorageFour = dappStorageMapper.selectSumByAmountDescFiveToFive(DateUtil.offsetHour(new Date(),-24),3,1);
if(CollUtil.isNotEmpty(dappStorageFour)){
BigDecimal multiply = everyAmount.multiply(new BigDecimal(fourCount));
dappSystemService.updateBalanceInsertFlow(
@@ -256,7 +256,9 @@
*/
HashMap<Long, BigDecimal> map = new HashMap<>();
- List<DappMemberEntity> dappMemberEntityList = dappMemberDao.selectListByDate(new Date());
+ DateTime startTime = DateUtil.offsetHour(new Date(), -24);
+ List<DappMemberEntity> dappMemberEntityList = dappMemberDao.selectListByDateFiveToFiver(startTime);
+
if(CollUtil.isNotEmpty(dappMemberEntityList)){
for(DappMemberEntity member : dappMemberEntityList){
if(StrUtil.isEmpty(member.getRefererId())){
@@ -337,8 +339,21 @@
}
public static void main(String[] args) {
+
DateTime dateTime = DateUtil.offsetHour(new Date(), -24);
System.out.println(dateTime);
+ DateTime nowTime = DateUtil.parseTime(DateUtil.formatTime(new Date()));
+ DateTime perkTime = DateUtil.parseTime("17:00:00");
+
+ String startTimeStr = null;
+ if(DateUtil.compare(nowTime,perkTime) >= 0){
+ startTimeStr = DateUtil.formatDate(DateUtil.offsetDay(new Date(), 0)) + " 17:00:00";
+ }else{
+ startTimeStr = DateUtil.formatDate(DateUtil.offsetDay(new Date(), -1)) + " 17:00:00";
+ }
+
+ DateTime startTime = DateUtil.parseDateTime(startTimeStr);
+
// 创建一个HashMap示例
--
Gitblit v1.9.1