From 7f6893cba272075352acc2ebb5a3a04ac75c91f0 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 08 Jul 2024 10:06:36 +0800
Subject: [PATCH] 逻辑
---
src/main/java/cc/mrbird/febs/job/ProfitDailyJob.java | 24 ++++++++++++------------
src/main/java/cc/mrbird/febs/dapp/mapper/DappStorageMapper.java | 2 ++
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 2 +-
src/main/resources/mapper/dapp/DappStorageMapper.xml | 16 ++++++++++++++++
4 files changed, 31 insertions(+), 13 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 ba7c10a..ed49a79 100644
--- a/src/main/java/cc/mrbird/febs/dapp/mapper/DappStorageMapper.java
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/DappStorageMapper.java
@@ -23,6 +23,8 @@
List<DappStorage> selectByAmountDesc(@Param("date") Date date,@Param("offset")int offset,@Param("count")int count);
+ List<DappStorage> selectSumByAmountDesc(@Param("date") Date date,@Param("offset")int offset,@Param("count")int count);
+
DappStorage selectAmountByAmountDesc(@Param("memberId")Long memberId,@Param("offset")int offset,@Param("count")int count);
IPage<DappStorage> selectListInPage(@Param("record")DappStorage dappStorage, Page<DappStorage> page);
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 cff6ce3..f5fd2de 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
@@ -695,7 +695,7 @@
@Override
public List<ApiStorageInfoVo> storageIndex() {
List<ApiStorageInfoVo> apiStorageInfoVos = new ArrayList<>();
- List<DappStorage> dappStorages = dappStorageMapper.selectByAmountDesc(DateUtil.offsetHour(new Date(), -1), 0, 10);
+ List<DappStorage> dappStorages = dappStorageMapper.selectSumByAmountDesc(DateUtil.offsetHour(new Date(), -1), 0, 10);
if(CollUtil.isNotEmpty(dappStorages)){
for(DappStorage dappStorage : dappStorages){
ApiStorageInfoVo apiStorageInfoVo = new ApiStorageInfoVo();
diff --git a/src/main/java/cc/mrbird/febs/job/ProfitDailyJob.java b/src/main/java/cc/mrbird/febs/job/ProfitDailyJob.java
index dd35143..df5b16b 100644
--- a/src/main/java/cc/mrbird/febs/job/ProfitDailyJob.java
+++ b/src/main/java/cc/mrbird/febs/job/ProfitDailyJob.java
@@ -173,45 +173,45 @@
BigDecimal everyAmount = daDanTotal.divide(new BigDecimal(count));
if(everyAmount.compareTo(BigDecimal.ZERO) > 0){
- DappStorage dappStorageOne = dappStorageMapper.selectAmountByDesc(new Date(),0,1);
- if(ObjectUtil.isNotEmpty(dappStorageOne)){
+ List<DappStorage> dappStorageOne = dappStorageMapper.selectSumByAmountDesc(new Date(),0,1);
+ if(CollUtil.isNotEmpty(dappStorageOne)){
BigDecimal multiply = everyAmount.multiply(new BigDecimal(oneCount));
dappSystemService.updateBalanceInsertFlow(
multiply,
- dappStorageOne.getMemberId(),
+ dappStorageOne.get(0).getMemberId(),
MoneyFlowEnum.DA_DAN_JI_LI_PERK.getValue(),
StrUtil.format(MoneyFlowEnum.DA_DAN_JI_LI_PERK.getDescrition(),daDanTotal,multiply));
realAmount = realAmount.add(multiply);
}
- DappStorage dappStorageTwo = dappStorageMapper.selectAmountByDesc(new Date(),1,1);
- if(ObjectUtil.isNotEmpty(dappStorageTwo)){
+ List<DappStorage> dappStorageTwo = dappStorageMapper.selectSumByAmountDesc(new Date(),1,1);
+ if(CollUtil.isNotEmpty(dappStorageTwo)){
BigDecimal multiply = everyAmount.multiply(new BigDecimal(twoCount));
dappSystemService.updateBalanceInsertFlow(
multiply,
- dappStorageTwo.getMemberId(),
+ dappStorageTwo.get(0).getMemberId(),
MoneyFlowEnum.DA_DAN_JI_LI_PERK.getValue(),
StrUtil.format(MoneyFlowEnum.DA_DAN_JI_LI_PERK.getDescrition(),daDanTotal,multiply));
realAmount = realAmount.add(multiply);
}
- DappStorage dappStorageThree = dappStorageMapper.selectAmountByDesc(new Date(),2,1);
- if(ObjectUtil.isNotEmpty(dappStorageThree)){
+ List<DappStorage> dappStorageThree = dappStorageMapper.selectSumByAmountDesc(new Date(),2,1);
+ if(CollUtil.isNotEmpty(dappStorageThree)){
BigDecimal multiply = everyAmount.multiply(new BigDecimal(threeCount));
dappSystemService.updateBalanceInsertFlow(
multiply,
- dappStorageThree.getMemberId(),
+ dappStorageThree.get(0).getMemberId(),
MoneyFlowEnum.DA_DAN_JI_LI_PERK.getValue(),
StrUtil.format(MoneyFlowEnum.DA_DAN_JI_LI_PERK.getDescrition(),daDanTotal,multiply));
realAmount = realAmount.add(multiply);
}
- DappStorage dappStorageFour = dappStorageMapper.selectAmountByDesc(new Date(),3,1);
- if(ObjectUtil.isNotEmpty(dappStorageFour)){
+ List<DappStorage> dappStorageFour = dappStorageMapper.selectSumByAmountDesc(new Date(),3,1);
+ if(CollUtil.isNotEmpty(dappStorageFour)){
BigDecimal multiply = everyAmount.multiply(new BigDecimal(fourCount));
dappSystemService.updateBalanceInsertFlow(
multiply,
- dappStorageFour.getMemberId(),
+ dappStorageFour.get(0).getMemberId(),
MoneyFlowEnum.DA_DAN_JI_LI_PERK.getValue(),
StrUtil.format(MoneyFlowEnum.DA_DAN_JI_LI_PERK.getDescrition(),daDanTotal,multiply));
diff --git a/src/main/resources/mapper/dapp/DappStorageMapper.xml b/src/main/resources/mapper/dapp/DappStorageMapper.xml
index 02ff46d..3849c09 100644
--- a/src/main/resources/mapper/dapp/DappStorageMapper.xml
+++ b/src/main/resources/mapper/dapp/DappStorageMapper.xml
@@ -74,6 +74,22 @@
</select>
+ <select id="selectSumByAmountDesc" resultType="cc.mrbird.febs.dapp.entity.DappStorage">
+ SELECT
+ member_id memberId,
+ sum(amount) amount
+ FROM
+ dapp_storage
+ where
+ date_format(create_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
+ GROUP BY
+ member_id
+ ORDER BY
+ amount DESC
+ limit #{offset},#{count}
+ </select>
+
+
<select id="selectAmountByAmountDesc" resultType="cc.mrbird.febs.dapp.entity.DappStorage">
select
*
--
Gitblit v1.9.1