From 4575ae4dbedd7046f4b7aeeb79b49059676e2201 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 22 Jul 2024 16:18:21 +0800
Subject: [PATCH] 逻辑
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 69 ++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 20 deletions(-)
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 27caa88..d04fc98 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
@@ -1,5 +1,6 @@
package cc.mrbird.febs.dapp.service.impl;
+import cc.mrbird.febs.common.contants.AppContants;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.exception.FebsException;
@@ -95,7 +96,7 @@
BigDecimal runPerk = dappFundFlowDao.selectSumRunPerkByMemberId(member.getId());
walletInfo.setRunPerk(runPerk);
-
+// List<DappMemberEntity> dappMemberEntities = dappMemberDao.selectList(null);
List<DappStorage> allAddressNums = dappStorageMapper.selectListGroupByMemberId();
walletInfo.setAddressNum(CollUtil.isEmpty(allAddressNums) ? 0 : allAddressNums.size());
@@ -243,17 +244,26 @@
DappMemberEntity memberEntity = dappMemberDao.selectById(member.getId());
BigDecimal usdtBalance = memberEntity.getUsdtBalance();
- if(BigDecimal.ZERO.compareTo(usdtBalance) >= 0){
- throw new FebsException("额度不足");
- }
+ if(1 != memberEntity.getNodeType()){
+ if(BigDecimal.ZERO.compareTo(usdtBalance) >= 0){
+ throw new FebsException("额度不足");
+ }
- if(BigDecimal.ZERO.compareTo(withdrawDto.getAmount()) >= 0){
- throw new FebsException("请输入正确的数量");
+ if(BigDecimal.ZERO.compareTo(withdrawDto.getAmount()) >= 0){
+ throw new FebsException("请输入正确的数量");
+ }
+ if(withdrawDto.getAmount().compareTo(usdtBalance) > 0){
+ throw new FebsException("额度不足");
+ }
+ DappStorage dappStorage = dappStorageMapper.selectAmountByAmountDesc(member.getId(),0, 1);
+ if(ObjectUtil.isEmpty(dappStorage)){
+ throw new FebsException("请存储");
+ }
+ }else{
+ if(BigDecimal.ZERO.compareTo(withdrawDto.getAmount()) >= 0){
+ throw new FebsException("请输入正确的数量");
+ }
}
- if(withdrawDto.getAmount().compareTo(usdtBalance) > 0){
- throw new FebsException("额度不足");
- }
-
// List<MemberCoinWithdrawEntity> memberCoinWithdrawEntities = memberCoinWithdrawDao.selectListByDate(member.getId(),new Date());
// if(CollUtil.isNotEmpty(memberCoinWithdrawEntities)){
// throw new FebsException("今日已提现");
@@ -272,9 +282,10 @@
BigDecimal feeAmount = withdrawDto.getAmount().multiply(withdrawPercent).setScale(2, BigDecimal.ROUND_DOWN);
updateWalletCoinWithLock(withdrawDto.getAmount(), member.getId(), 2);
-
- memberEntity.setUsdtBalance(usdtBalance.subtract(withdrawDto.getAmount()).setScale(2,BigDecimal.ROUND_DOWN));
- dappMemberDao.updateById(memberEntity);
+ if(1 != memberEntity.getNodeType()){
+ memberEntity.setUsdtBalance(usdtBalance.subtract(withdrawDto.getAmount()).setScale(2,BigDecimal.ROUND_DOWN));
+ dappMemberDao.updateById(memberEntity);
+ }
DappFundFlowEntity fundFlow = new DappFundFlowEntity(
member.getId(),
@@ -696,8 +707,9 @@
DataDictionaryEnum.BUCAHNG_CHI.getCode()
).getValue());
List<DappStorage> dappStorages = dappStorageMapper.selectList(null);
- BigDecimal reduce = dappStorages.stream().map(DappStorage::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2,BigDecimal.ROUND_DOWN);
- apiIndexInfoVo.setJiedianChi(reduce.toString());
+ BigDecimal reduce = dappStorages.stream().map(DappStorage::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal bigDecimal = reduce.multiply(new BigDecimal(AppContants.DAO_NODE_PERCENT)).setScale(2, BigDecimal.ROUND_DOWN);
+ apiIndexInfoVo.setJiedianChi(bigDecimal.toString());
// apiIndexInfoVo.setJiedianChi(dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
// DataDictionaryEnum.JIE_DIAN_CHI.getType(),
@@ -812,12 +824,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;
}
@@ -854,10 +869,24 @@
ApiDirectInfoVo apiDirectInfoVo = new ApiDirectInfoVo();
apiDirectInfoVo.setAddress(dappMemberDao.selectById(memberId).getAddress());
apiDirectInfoVo.setAmount(directCnt);
-
+ DappStorage dappStorage = dappStorageMapper.selectNewRecordByRefMemberId(memberId);
+ apiDirectInfoVo.setCreateTime(dappStorage.getCreateTime());
apiDirectInfoVos.add(apiDirectInfoVo);
}
}
+ if(CollUtil.isNotEmpty(apiDirectInfoVos)){
+ apiDirectInfoVos = apiDirectInfoVos.stream()
+ .sorted((a, b) -> {
+ // 先按照amount从大到小排序
+ int compare = b.getAmount().compareTo(a.getAmount());
+ if (compare != 0) {
+ return compare;
+ }
+ // 如果amount相同，则按照createTime从小到大排序
+ return a.getCreateTime().compareTo(b.getCreateTime());
+ })
+ .collect(Collectors.toList());
+ }
return apiDirectInfoVos;
--
Gitblit v1.9.1