From 29096e068f03da0467356d5d788c41448b259f99 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sat, 06 Jul 2024 00:50:14 +0800
Subject: [PATCH] 逻辑
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 2 +-
src/main/java/cc/mrbird/febs/dapp/mapper/DappStorageMapper.java | 2 ++
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 7 +++++++
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 6 +++---
src/main/resources/mapper/dapp/DappStorageMapper.xml | 10 ++++++++++
5 files changed, 23 insertions(+), 4 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 e431fbd..972dcc6 100644
--- a/src/main/java/cc/mrbird/febs/dapp/mapper/DappStorageMapper.java
+++ b/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);
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index 9492d52..3e89f6a 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/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到流中
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
index 8b530f2..e30e0e6 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
+++ b/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;
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 74ddc37..d82d003 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
@@ -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(
diff --git a/src/main/resources/mapper/dapp/DappStorageMapper.xml b/src/main/resources/mapper/dapp/DappStorageMapper.xml
index 788ebd5..7daaa38 100644
--- a/src/main/resources/mapper/dapp/DappStorageMapper.xml
+++ b/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.*,
--
Gitblit v1.9.1