From 11e14ba210ed19aaf89cade6d5b51b6c53ca38aa Mon Sep 17 00:00:00 2001
From: 2019232 <zh123456>
Date: Tue, 13 Dec 2022 16:54:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/BNBWEB' into BNBWEB
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 255 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 244 insertions(+), 11 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 5c8cf98..672f6f7 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
@@ -12,6 +12,7 @@
import cc.mrbird.febs.dapp.chain.ContractChainService;
import cc.mrbird.febs.dapp.dto.*;
import cc.mrbird.febs.dapp.entity.*;
+import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum;
import cc.mrbird.febs.dapp.mapper.*;
import cc.mrbird.febs.dapp.service.DappWalletService;
import cc.mrbird.febs.dapp.utils.BoxUtil;
@@ -22,6 +23,8 @@
import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -54,9 +57,11 @@
private final RedisUtils redisUtils;
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final DappNftActivationDao dappNftActivationDao;
+ private final MemberCoinWithdrawDao memberCoinWithdrawDao;
private final ChainProducer chainProducer;
private final DappSystemDao dappSystemDao;
+ private final DappSystemProfitDao dappSystemProfitDao;
@Override
public WalletInfoVo walletInfo() {
@@ -64,7 +69,7 @@
DappMemberEntity memberInfo = dappMemberDao.selectById(member.getId());
WalletInfoVo walletInfo = new WalletInfoVo();
- List<DappMemberEntity> direct = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 1);
+ List<DappMemberEntity> direct = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 1, 1);
DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId());
DappWalletMineEntity walletMine = dappWalletMineDao.selectByMemberId(member.getId());
@@ -77,6 +82,59 @@
walletInfo.setProfit(dappFundFlowDao.selectProfitAmountByMemberId(member.getId()));
walletInfo.setTfcBalance(walletMine.getAvailableAmount());
walletInfo.setSafePool(mineData.getSafePool());
+
+ walletInfo.setAccountType(memberInfo.getAccountType());
+ DappSystemProfit dappSystemProfit = dappSystemProfitDao.selectByMemberIdAndState(memberInfo.getId(),DappSystemProfit.STATE_IN);
+ walletInfo.setSystemProfitId(ObjectUtil.isEmpty(dappSystemProfit) ? 0L : dappSystemProfit.getId());
+ BigDecimal directProfit = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(memberInfo.getId(),3,2);
+ walletInfo.setDirectProfit(directProfit);
+ BigDecimal levelProfit = dappFundFlowDao.selectSumAmountByMemberIdAndTypeAndStatus(memberInfo.getId(),4,2);
+ 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;
}
@@ -90,7 +148,7 @@
dappFundFlowEntity.setType(recordInPageDto.getType());
}
dappFundFlowEntity.setMemberId(member.getId());
- dappFundFlowEntity.setStatus(2);
+// dappFundFlowEntity.setStatus(2);
IPage<DappFundFlowEntity> records = dappFundFlowDao.selectInPage(page, dappFundFlowEntity);
return records.getRecords();
@@ -120,9 +178,20 @@
return dappAccountMoneyChangeDao.selectInPage(change, page);
}
+ /**
+ * // 第一次{amount: val, fee: 0, txHash: '', type: 1, buyType: 2}
+ * // 成功{type: 1, txHash: result.transactionHash, id: res.data, flag: 'success', buyType: 2}
+ * // 失败{type: 1, id: res.data, flag: 'fail', buyType: 2}
+ */
@Override
public Long transfer(TransferDto transferDto) {
DappMemberEntity member = LoginUserUtil.getAppUser();
+// DappMemberEntity member = dappMemberDao.selectById(transferDto.getMemberId());
+
+ String upgrade = redisUtils.getString("APP_UPGRADE");
+ if ("upgrade".equals(upgrade)) {
+ throw new FebsException("功能升级中");
+ }
if (transferDto.getType() != 2) {
member = dappMemberDao.selectById(member.getId());
@@ -150,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();
@@ -157,8 +230,52 @@
if ("success".equals(transferDto.getFlag())) {
DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
+ if(DappFundFlowEntity.WITHDRAW_STATUS_AGREE == flow.getStatus()){
+ throw new FebsException("Do not repeat purchase");
+ }
+ //是否已经加入动能
+ DappSystemProfit dappSystemProfitIng = dappSystemProfitDao.selectByMemberIdAndState(member.getId(), DappSystemProfit.STATE_IN);
+ if(ObjectUtil.isNotEmpty(dappSystemProfitIng)){
+ throw new FebsException("Do not repeat purchase");
+ }
+
+ //插入一条会员入列记录,即加入动能队列
+ DappSystemProfit dappSystemProfit = new DappSystemProfit(member.getId(), flow.getAmount());
+ dappSystemProfitDao.insert(dappSystemProfit);
+
flow.setFromHash(transferDto.getTxHash());
+ flow.setSystemProfitId(dappSystemProfit.getId());
+ flow.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
dappFundFlowDao.updateById(flow);
+ //升级成为Agent
+ dappMemberDao.updateMemberAccountType(DataDictionaryEnum.AGENT.getCode(),member.getId());
+ dappMemberDao.updateMemberActiveStatus(1,member.getId());
+
+ //直接拿走0.05个BNB放入技术方
+ DataDictionaryCustom systemProfit = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SYSTEM_PROFIT.getType(), DataDictionaryEnum.SYSTEM_PROFIT.getCode());
+ String systemProfitStr = StrUtil.isEmpty(systemProfit.getValue()) ? "0.05" : systemProfit.getValue();
+ DappFundFlowEntity systemProfitFlow = new DappFundFlowEntity(1L, new BigDecimal(systemProfitStr), 2, 1, BigDecimal.ZERO, null,dappSystemProfit.getId());
+ dappFundFlowDao.insert(systemProfitFlow);
+ //发送转币消息
+// chainProducer.sendBnbTransferMsg(systemProfitFlow.getId());
+ //直接返利30%给直接上级
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectById(member.getId());
+ String refererId = dappMemberEntity.getRefererId();
+ DappMemberEntity refererMember = dappMemberDao.selectMemberInfoByInviteId(refererId);
+
+ DataDictionaryCustom directProfitSet = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.DIRECT_PROFIT.getType(), DataDictionaryEnum.DIRECT_PROFIT.getCode());
+ BigDecimal directProfitStr = new BigDecimal(StrUtil.isEmpty(directProfitSet.getValue()) ? "0.3" : directProfitSet.getValue());
+ BigDecimal subtract = transferDto.getAmount().subtract(new BigDecimal(systemProfitStr));
+ BigDecimal directProfit = subtract.multiply(directProfitStr).setScale(6,BigDecimal.ROUND_DOWN);
+
+ DappFundFlowEntity fundFlow = new DappFundFlowEntity(refererMember.getId(), directProfit, 3, 1, BigDecimal.ZERO, null,dappSystemProfit.getId());
+ dappFundFlowDao.insert(fundFlow);
+ //发送转币消息
+// chainProducer.sendBnbTransferMsg(fundFlow.getId());
+ //层级奖励30%
+ chainProducer.sendLevelProfitMsg(dappSystemProfit.getId());
+ //发送一个消息，计算当前是否有人可以出局
+ chainProducer.sendMemberOutMsg(dappSystemProfit.getId());
} else {
DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
if (flow.getStatus() == 1) {
@@ -171,13 +288,15 @@
@Override
public BigDecimal calPrice(PriceDto priceDto) {
- String priceStr = redisUtils.getString(AppContants.REDIS_KEY_TFC_NEW_PRICE);
+// String priceStr = redisUtils.getString(AppContants.REDIS_KEY_TFC_NEW_PRICE);
+ DataDictionaryCustom symbolPrice = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SYMBOL_PRICE.getType(), DataDictionaryEnum.SYMBOL_PRICE.getCode());
+ DataDictionaryCustom serviceFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WITHDRAW_SERVICE_FEE.getType(), DataDictionaryEnum.WITHDRAW_SERVICE_FEE.getCode());
BigDecimal amount = priceDto.getAmount();
if (priceDto.getAmount() == null) {
amount = BigDecimal.ZERO;
}
- return amount.multiply(new BigDecimal("0.1")).divide(new BigDecimal(priceStr), 2, RoundingMode.HALF_UP);
+ return amount.multiply(new BigDecimal(serviceFeeDic.getValue()).divide(BigDecimal.valueOf(100), 8, RoundingMode.HALF_DOWN)).divide(new BigDecimal(symbolPrice.getValue()), 2, RoundingMode.HALF_UP);
}
@Override
@@ -192,11 +311,12 @@
DappWalletMineEntity walletMine = dappWalletMineDao.selectByMemberId(member.getId());
if (walletMine.getAvailableAmount().compareTo(withdrawDto.getFee()) < 0) {
- throw new FebsException("TFC Not Enough");
+ throw new FebsException("DMD Not Enough");
}
updateWalletCoinWithLock(withdrawDto.getAmount(), member.getId(), 2);
updateWalletMineWithLock(withdrawDto.getFee(), member.getId(), 2);
+
DappFundFlowEntity feeFlow = new DappFundFlowEntity(member.getId(), withdrawDto.getFee().negate(), 7, 2, null, null);
dappFundFlowDao.insert(feeFlow);
@@ -204,15 +324,26 @@
DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), withdrawDto.getAmount().negate(), 5, 2, withdrawDto.getFee(), null);
dappFundFlowDao.insert(fundFlow);
+ MemberCoinWithdrawEntity memberCoinWithdraw = new MemberCoinWithdrawEntity();
+ memberCoinWithdraw.setMemberId(member.getId());
+ memberCoinWithdraw.setAddress(member.getAddress());
+ memberCoinWithdraw.setAmount(withdrawDto.getAmount());
+ memberCoinWithdraw.setFeeAmount(withdrawDto.getFee());
+ memberCoinWithdraw.setStatus(MemberCoinWithdrawEntity.STATUS_YES);
+ memberCoinWithdraw.setSymbol("USDT");
+ memberCoinWithdraw.setFlowId(fundFlow.getId());
+ memberCoinWithdrawDao.insert(memberCoinWithdraw);
+
String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(member.getAddress(), withdrawDto.getAmount());
fundFlow.setToHash(hash);
dappFundFlowDao.updateById(fundFlow);
- Map<String, Object> map = new HashMap<>();
- map.put("fee", withdrawDto.getFee());
- map.put("address", ChainEnum.BSC_TFC_FEE.getAddress());
- map.put("flow", feeFlow.getId());
- chainProducer.sendTfcFee(JSONObject.toJSONString(map));
+ chainProducer.sendFeeDistributeMsg(fundFlow.getId());
+// Map<String, Object> map = new HashMap<>();
+// map.put("fee", withdrawDto.getFee());
+// map.put("address", ChainEnum.BSC_TFC_FEE.getAddress());
+// map.put("flow", feeFlow.getId());
+// chainProducer.sendTfcFee(JSONObject.toJSONString(map));
}
@Override
@@ -252,7 +383,7 @@
walletMine.setAvailableAmount(walletMine.getAvailableAmount().add(amount));
} else {
if (amount.compareTo(walletMine.getAvailableAmount()) > 0) {
- throw new FebsException("TFC Not Enough");
+ throw new FebsException("DMD Not Enough");
}
walletMine.setTotalAmount(walletMine.getTotalAmount().subtract(amount));
walletMine.setAvailableAmount(walletMine.getAvailableAmount().subtract(amount));
@@ -264,4 +395,106 @@
}
}
}
+
+ @Override
+ public void addFrozenAmountWithLock(BigDecimal amount, Long memberId) {
+ boolean isSuccess = false;
+ while(!isSuccess) {
+ DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(memberId);
+
+ walletCoin.setTotalAmount(walletCoin.getTotalAmount().add(amount));
+ walletCoin.setFrozenAmount(walletCoin.getFrozenAmount().add(amount));
+
+ int i = dappWalletCoinDao.updateWithLock(walletCoin);
+ if (i > 0) {
+ isSuccess = true;
+
+ DappFundFlowEntity frozenAmount = new DappFundFlowEntity(memberId, amount, 9, 2, null, null);
+ dappFundFlowDao.insert(frozenAmount);
+ }
+ }
+ }
+
+ @Override
+ public void releaseFrozenAmountWithLock(Long memberId) {
+ boolean isSuccess = false;
+ while(!isSuccess) {
+ DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(memberId);
+
+ if (walletCoin.getFrozenAmount().compareTo(BigDecimal.ZERO) <= 0) {
+ return;
+ }
+ BigDecimal frozen = walletCoin.getFrozenAmount();
+
+ walletCoin.setAvailableAmount(walletCoin.getAvailableAmount().add(frozen));
+ walletCoin.setFrozenAmount(walletCoin.getFrozenAmount().subtract(frozen));
+
+ int i = dappWalletCoinDao.updateWithLock(walletCoin);
+ if (i > 0) {
+ isSuccess = true;
+
+ DappFundFlowEntity releaseFrozen = new DappFundFlowEntity(memberId, frozen, 10, 2, null, null);
+ dappFundFlowDao.insert(releaseFrozen);
+
+ DappFundFlowEntity releaseFrozenNegate = new DappFundFlowEntity(memberId, frozen.negate(), 9, 2, null, null);
+ dappFundFlowDao.insert(releaseFrozenNegate);
+ }
+ }
+ }
+
+ @Override
+ public DappWalletCoinEntity findByMemberId(Long memberId) {
+ return dappWalletCoinDao.selectByMemberId(memberId);
+ }
+
+ @Override
+ public void transferAgain(TransferDto transferDto) {
+ Long memberId = transferDto.getMemberId();
+ DappMemberEntity member = dappMemberDao.selectById(memberId);
+ String upgrade = redisUtils.getString("APP_UPGRADE");
+ if ("upgrade".equals(upgrade)) {
+ throw new FebsException("功能升级中");
+ }
+ if ("success".equals(transferDto.getFlag())) {
+ //是否已经加入动能
+ DappSystemProfit dappSystemProfitIng = dappSystemProfitDao.selectByMemberIdAndState(member.getId(), DappSystemProfit.STATE_IN);
+ if(ObjectUtil.isNotEmpty(dappSystemProfitIng)){
+ return;
+ }
+ //插入一条会员入列记录,即加入动能队列
+ DappSystemProfit dappSystemProfit = new DappSystemProfit(member.getId(), transferDto.getAmount());
+ dappSystemProfitDao.insert(dappSystemProfit);
+ DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
+ flow.setFromHash(transferDto.getTxHash());
+ flow.setSystemProfitId(dappSystemProfit.getId());
+ flow.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
+ dappFundFlowDao.updateById(flow);
+
+ //直接拿走0.05个BNB放入技术方
+ DataDictionaryCustom systemProfit = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SYSTEM_PROFIT.getType(), DataDictionaryEnum.SYSTEM_PROFIT.getCode());
+ String systemProfitStr = StrUtil.isEmpty(systemProfit.getValue()) ? "0.05" : systemProfit.getValue();
+ DappFundFlowEntity systemProfitFlow = new DappFundFlowEntity(1L, new BigDecimal(systemProfitStr), 2, 1, BigDecimal.ZERO, null,dappSystemProfit.getId());
+ dappFundFlowDao.insert(systemProfitFlow);
+ //发送转币消息
+// chainProducer.sendBnbTransferMsg(systemProfitFlow.getId());
+ //直接返利30%给直接上级
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectById(member.getId());
+ String refererId = dappMemberEntity.getRefererId();
+ DappMemberEntity refererMember = dappMemberDao.selectMemberInfoByInviteId(refererId);
+
+ DataDictionaryCustom directProfitSet = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.DIRECT_PROFIT.getType(), DataDictionaryEnum.DIRECT_PROFIT.getCode());
+ BigDecimal directProfitStr = new BigDecimal(StrUtil.isEmpty(directProfitSet.getValue()) ? "0.3" : directProfitSet.getValue());
+ BigDecimal directProfit = (transferDto.getAmount().subtract(new BigDecimal(systemProfitStr))).multiply(directProfitStr).setScale(6,BigDecimal.ROUND_DOWN);
+
+ DappFundFlowEntity fundFlow = new DappFundFlowEntity(refererMember.getId(), directProfit, 3, 1, BigDecimal.ZERO, null,dappSystemProfit.getId());
+ dappFundFlowDao.insert(fundFlow);
+ //发送转币消息
+// chainProducer.sendBnbTransferMsg(fundFlow.getId());
+ //层级奖励30%
+ chainProducer.sendLevelProfitMsg(dappSystemProfit.getId());
+ //发送一个消息，计算当前是否有人可以出局
+ chainProducer.sendMemberOutMsg(dappSystemProfit.getId());
+
+ }
+ }
}
--
Gitblit v1.9.1