From d04e6ff0df71d36c341cae9dde49def1a9f4bd92 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 25 Jun 2024 11:16:38 +0800
Subject: [PATCH] 后台矩阵列表
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 95 ++++++++++++++++++++++++++++++++---------------
1 files changed, 64 insertions(+), 31 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 5160cb4..98f3547 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
@@ -28,7 +28,9 @@
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @author
@@ -68,9 +70,10 @@
walletInfo.setDirectCnt(CollUtil.isEmpty(direct) ? 0 : direct.size());
walletInfo.setInviteCnt(CollUtil.isEmpty(inviteList) ? 0 : inviteList.size());
- List<DappMemberEntity> collect = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 2, 1);
-// List<DappMemberEntity> collect = direct.stream().filter(dappMemberEntity -> dappMemberEntity.getActiveStatus() == 1).collect(Collectors.toList());
- walletInfo.setActiveCnt(CollUtil.isEmpty(collect) ? 0 : collect.size());
+ List<DappMemberEntity> collect = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 1, 1);
+ walletInfo.setActiveDirect(CollUtil.isEmpty(collect) ? 0 : collect.size());
+ List<DappMemberEntity> collectTeam = direct.stream().filter(dappMemberEntity -> dappMemberEntity.getActiveStatus() == 1).collect(Collectors.toList());
+ walletInfo.setActiveCnt(CollUtil.isEmpty(collectTeam) ? 0 : collectTeam.size());
// walletInfo.setInviteId(member.getActiveStatus() == 1 ? member.getInviteId() : "-");
walletInfo.setInviteId(member.getInviteId());
walletInfo.setBalance(walletCoin.getAvailableAmount());
@@ -102,18 +105,26 @@
BigDecimal bigDecimal = dappFundFlowDao.selectSumAmountByMemberIdAndType(member.getId(), 14);
walletInfo.setBuyNodePerk(bigDecimal);
- Integer activeStatus = ObjectUtil.isEmpty(member.getActiveStatus()) ? 2 : member.getActiveStatus();
- if(1 == activeStatus){
- int i = memberInfo.getBuyNode() * 2000;
- int teamCnt = CollUtil.isEmpty(direct) ? 0 : direct.size();
- int i1 = teamCnt * 15;
- QueryWrapper<DbMemberNode> objectQueryWrapper = new QueryWrapper<>();
- objectQueryWrapper.eq("member_id",member.getId());
- List<DbMemberNode> dbMemberNodes1 = dbMemberNodeMapper.selectList(objectQueryWrapper);
- walletInfo.setScoreCnt(i+i1+(CollUtil.isEmpty(dbMemberNodes1) ? 0 : dbMemberNodes1.size())*300);
- }else{
- walletInfo.setScoreCnt(0);
- }
+
+ int i = memberInfo.getBuyNode() * 2000;
+ int teamCnt = CollUtil.isEmpty(direct) ? 0 : direct.size();
+ int i1 = teamCnt * 15;
+ QueryWrapper<DbMemberNode> objectQueryWrapper = new QueryWrapper<>();
+ objectQueryWrapper.eq("member_id",member.getId());
+ List<DbMemberNode> dbMemberNodes1 = dbMemberNodeMapper.selectList(objectQueryWrapper);
+ walletInfo.setScoreCnt(i+i1+(CollUtil.isEmpty(dbMemberNodes1) ? 0 : dbMemberNodes1.size())*300);
+// Integer activeStatus = ObjectUtil.isEmpty(member.getActiveStatus()) ? 2 : member.getActiveStatus();
+// if(1 == activeStatus){
+// int i = memberInfo.getBuyNode() * 2000;
+// int teamCnt = CollUtil.isEmpty(direct) ? 0 : direct.size();
+// int i1 = teamCnt * 15;
+// QueryWrapper<DbMemberNode> objectQueryWrapper = new QueryWrapper<>();
+// objectQueryWrapper.eq("member_id",member.getId());
+// List<DbMemberNode> dbMemberNodes1 = dbMemberNodeMapper.selectList(objectQueryWrapper);
+// walletInfo.setScoreCnt(i+i1+(CollUtil.isEmpty(dbMemberNodes1) ? 0 : dbMemberNodes1.size())*300);
+// }else{
+// walletInfo.setScoreCnt(0);
+// }
return walletInfo;
}
@@ -236,7 +247,9 @@
}
BigDecimal feeUsdt = withdrawCnt.multiply(feePercent).setScale(2, BigDecimal.ROUND_DOWN);
- return feeUsdt.divide(priceDto.getAmount(), 2, BigDecimal.ROUND_DOWN);
+ return feeUsdt;
+
+// return feeUsdt.divide(priceDto.getAmount(), 2, BigDecimal.ROUND_DOWN);
}
@Override
@@ -244,24 +257,25 @@
public void withdraw(WithdrawDto withdrawDto) {
DappMemberEntity member = LoginUserUtil.getAppUser();
+ List<MemberCoinWithdrawEntity> memberCoinWithdrawEntities = memberCoinWithdrawDao.selectListByDate(new Date());
+ if(CollUtil.isNotEmpty(memberCoinWithdrawEntities)){
+ throw new FebsException("今日已提现");
+ }
+
DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId());
if (walletCoin.getAvailableAmount().compareTo(withdrawDto.getAmount()) < 0) {
throw new FebsException("Balance Not Enough");
}
- DappWalletMineEntity walletMine = dappWalletMineDao.selectByMemberId(member.getId());
- if (walletMine.getAvailableAmount().compareTo(withdrawDto.getFee()) < 0) {
- throw new FebsException("Fee Not Enough");
- }
+// DappWalletMineEntity walletMine = dappWalletMineDao.selectByMemberId(member.getId());
+// if (walletMine.getAvailableAmount().compareTo(withdrawDto.getFee()) < 0) {
+// throw new FebsException("Fee Not Enough");
+// }
updateWalletCoinWithLock(withdrawDto.getAmount(), member.getId(), 2);
- updateWalletMineWithLock(withdrawDto.getFee(), member.getId(), 2);
+// updateWalletMineWithLock(withdrawDto.getFee(), member.getId(), 2);
-
- DappFundFlowEntity feeFlow = new DappFundFlowEntity(member.getId(), withdrawDto.getFee().negate(), 20, 2, null, null);
- dappFundFlowDao.insert(feeFlow);
-
- DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), withdrawDto.getAmount().negate(), 21, 2, withdrawDto.getFee(), null);
+ DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), withdrawDto.getAmount().negate(), 21, 1, withdrawDto.getFee(), null);
dappFundFlowDao.insert(fundFlow);
MemberCoinWithdrawEntity memberCoinWithdraw = new MemberCoinWithdrawEntity();
@@ -483,6 +497,18 @@
}
if (ObjectUtil.isEmpty(buyStarDto.getId())) {//第一次
+ List<DbMemberNode> dbMemberNodesDone = dbMemberNodeMapper.selectListByDate(new Date());
+ if(CollUtil.isNotEmpty(dbMemberNodesDone)){
+ DataDictionaryCustom buyNodeNumDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.BUY_NODE_NUM.getType(),
+ DataDictionaryEnum.BUY_NODE_NUM.getCode()
+ );
+ int buyNodeNum = Integer.parseInt(buyNodeNumDic.getValue());
+ if(buyNodeNum < dbMemberNodesDone.size()){
+ throw new FebsException("今日已满，请明日再来");
+ }
+ };
+
DappFundFlowEntity fundFlow = new DappFundFlowEntity(
member.getId(),
buyStarDto.getAmount().negate(),
@@ -580,7 +606,9 @@
@Override
public FebsResponse agreeWithdraw(Long id) {
- MemberCoinWithdrawEntity memberCoinWithdrawEntity = memberCoinWithdrawDao.selectById(id);
+ QueryWrapper<MemberCoinWithdrawEntity> objectQueryWrapper = new QueryWrapper<>();
+ objectQueryWrapper.eq("flow_id",id);
+ MemberCoinWithdrawEntity memberCoinWithdrawEntity = memberCoinWithdrawDao.selectOne(objectQueryWrapper);
if(ObjectUtil.isEmpty(memberCoinWithdrawEntity)){
throw new FebsException("刷新页面重试");
}
@@ -595,12 +623,18 @@
dappFundFlowEntity.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
dappFundFlowDao.updateById(dappFundFlowEntity);
+ DappFundFlowEntity feeFlow = new DappFundFlowEntity(dappFundFlowEntity.getMemberId(), memberCoinWithdrawEntity.getFeeAmount().negate(), 20, 1, null, null);
+ dappFundFlowDao.insert(feeFlow);
+
return new FebsResponse().success();
}
@Override
public FebsResponse disagreeWithdraw(Long id) {
- MemberCoinWithdrawEntity memberCoinWithdrawEntity = memberCoinWithdrawDao.selectById(id);
+
+ QueryWrapper<MemberCoinWithdrawEntity> objectQueryWrapper = new QueryWrapper<>();
+ objectQueryWrapper.eq("flow_id",id);
+ MemberCoinWithdrawEntity memberCoinWithdrawEntity = memberCoinWithdrawDao.selectOne(objectQueryWrapper);
if(ObjectUtil.isEmpty(memberCoinWithdrawEntity)){
throw new FebsException("刷新页面重试");
}
@@ -620,9 +654,8 @@
dappFundFlowDao.updateById(dappFundFlowEntity);
this.updateWalletCoinWithLock(memberCoinWithdrawEntity.getAmount(), memberCoinWithdrawEntity.getMemberId(), 1);
- this.updateWalletMineWithLock(memberCoinWithdrawEntity.getFeeAmount(), memberCoinWithdrawEntity.getMemberId(), 1);
- DappFundFlowEntity feeFlow = new DappFundFlowEntity(memberCoinWithdrawEntity.getMemberId(), memberCoinWithdrawEntity.getFeeAmount(), 22, 2, null, null);
+ DappFundFlowEntity feeFlow = new DappFundFlowEntity(memberCoinWithdrawEntity.getMemberId(), memberCoinWithdrawEntity.getAmount(), 22, 2, null, null);
dappFundFlowDao.insert(feeFlow);
return new FebsResponse().success();
}
@@ -641,7 +674,7 @@
QueryWrapper<DbMemberNode> childQuery = new QueryWrapper<>();
childQuery.eq("parent_node",id);
childQuery.eq("type", dbMemberNode.getType());
- childQuery.eq("work_state", DbMemberNode.STATE_ONE);
+// childQuery.eq("work_state", DbMemberNode.STATE_ONE);
List<DbMemberNode> childrenNode = dbMemberNodeMapper.selectList(childQuery);
if(CollUtil.isEmpty(childrenNode)){
return memberNodeVo;
--
Gitblit v1.9.1