From ad959c3690aea52a0e54e92b001d1959c26c4cc4 Mon Sep 17 00:00:00 2001
From: 2019232 <zh123456>
Date: Wed, 14 Dec 2022 15:40:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/BNBWEB' into BNBWEB
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 insertions(+), 2 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 88b5bed..ae6f35b 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
@@ -92,6 +92,49 @@
walletInfo.setLevelProfit(levelProfit);
BigDecimal luckyProfit = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(memberInfo.getId(),7,2);
walletInfo.setLuckyProfit(luckyProfit);
+// //获取当前是第几轮队列
+// String redisKey = "QUEUE_COUNT";
+// String memberOutCount = redisUtils.getString(redisKey);
+// DataDictionaryCustom queueCountSet = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.QUEUE_COUNT.getType(), DataDictionaryEnum.QUEUE_COUNT.getCode());
+// String queueCount = queueCountSet.getValue();
+// if(StrUtil.isBlank(memberOutCount)){
+// redisUtils.set(redisKey,queueCount,0L);
+// memberOutCount = queueCount;
+// }
+// //出局条件的人数
+// /**
+// * 初始大小 5+4*0
+// * 1 1,2,3,4,5 1出局 5+4*0
+// * 2 2,3,4,5,1(复投),7,8,9,10 2出局 5+4*1
+// * 3 3,4,5,1(复投),7,8,9,10,2(复投),12,13,14,15 3出局 5+4*2
+// * 4 4,5,1(复投),7,8,9,10,2(复投),12,13,14,15,3(复投),17,18,19,20 4出局 5+4*3
+// */
+// Integer memberCount = Integer.parseInt(memberOutCount) * 4 + 5;
+// //判断当前是否符合出局条件
+// QueryWrapper<DappSystemProfit> objectQueryWrapper = new QueryWrapper<>();
+// objectQueryWrapper.eq("state",DappSystemProfit.STATE_IN);
+// //实际投资人数
+// Integer selectCount = dappSystemProfitDao.selectCount(objectQueryWrapper);
+// BigDecimal memberRunPercent = BigDecimal.ZERO;
+// List<DappSystemProfit> dappSystemProfits = dappSystemProfitDao.selectDappSysstemProfitByState(DappSystemProfit.STATE_IN);
+// if(CollUtil.isEmpty(dappSystemProfits)){
+// walletInfo.setRunPercent(memberRunPercent);
+// }
+//
+// for(int i=0;i<dappSystemProfits.size();i++){
+// DappSystemProfit systemProfit = dappSystemProfits.get(i);
+// if(memberInfo.getId() == systemProfit.getMemberId()){
+// BigDecimal size = new BigDecimal(dappSystemProfits.size());
+// memberRunPercent = size.subtract(new BigDecimal(i+1));
+// }
+// }
+// BigDecimal runPercent = memberRunPercent.divide(new BigDecimal(memberCount), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100));
+// walletInfo.setRunPercent(runPercent);
+ if(DataDictionaryEnum.BIG_BOSS.getCode().equals(memberInfo.getAccountType())){
+ walletInfo.setRunPercent(new BigDecimal(100));
+ }else{
+ walletInfo.setRunPercent(new BigDecimal(90));
+ }
return walletInfo;
}
@@ -176,6 +219,10 @@
type = 6;
}
if (transferDto.getId() == null) {
+ DappFundFlowEntity fundFlowOld = dappFundFlowDao.selectBymemberIdAndType(member.getId(),type);
+ if(ObjectUtil.isNotEmpty(fundFlowOld)){
+ throw new FebsException("Do not repeat purchase");
+ }
DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), transferDto.getAmount(), type, 1, transferDto.getFee(), transferDto.getTxHash());
dappFundFlowDao.insert(fundFlow);
return fundFlow.getId();
@@ -184,12 +231,12 @@
if ("success".equals(transferDto.getFlag())) {
DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
if(DappFundFlowEntity.WITHDRAW_STATUS_AGREE == flow.getStatus()){
- return null;
+ throw new FebsException("Do not repeat purchase");
}
//是否已经加入动能
DappSystemProfit dappSystemProfitIng = dappSystemProfitDao.selectByMemberIdAndState(member.getId(), DappSystemProfit.STATE_IN);
if(ObjectUtil.isNotEmpty(dappSystemProfitIng)){
- return null;
+ throw new FebsException("Do not repeat purchase");
}
//插入一条会员入列记录,即加入动能队列
--
Gitblit v1.9.1