From 83f2d67e5085b052fa6e2e4b0f29a1cbc0a638f7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 19 May 2023 17:56:11 +0800
Subject: [PATCH] twoCoin项目修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 313 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 298 insertions(+), 15 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 38e02e6..dfb21e6 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,16 +12,21 @@
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.enumerate.NodeCodeEnum;
import cc.mrbird.febs.dapp.mapper.*;
import cc.mrbird.febs.dapp.service.DappWalletService;
import cc.mrbird.febs.dapp.utils.BoxUtil;
import cc.mrbird.febs.dapp.vo.ActiveNftListVo;
+import cc.mrbird.febs.dapp.vo.DappMemberNodeVo;
import cc.mrbird.febs.dapp.vo.WalletInfoVo;
import cc.mrbird.febs.rabbit.producer.ChainProducer;
import cn.hutool.core.collection.CollUtil;
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 +59,14 @@
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;
+
+ private final DappNodeOrderMapper dappNodeOrderMapper;
+ private final DappMemberNodeMapper dappMemberNodeMapper;
@Override
public WalletInfoVo walletInfo() {
@@ -64,7 +74,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 +87,25 @@
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);
+ if(DataDictionaryEnum.BIG_BOSS.getCode().equals(memberInfo.getAccountType())){
+ walletInfo.setRunPercent(new BigDecimal(100));
+ }else{
+ walletInfo.setRunPercent(new BigDecimal(90));
+ }
+
+ //获取会员节点信息
+ List<DappMemberNodeVo> dappMemberNodeVos = dappMemberNodeMapper.selectListByMemberId(member.getId());
+ walletInfo.setDappMemberNodeVos(dappMemberNodeVos);
return walletInfo;
}
@@ -90,7 +119,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 +149,19 @@
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();
+
+ String upgrade = redisUtils.getString("APP_UPGRADE");
+ if ("upgrade".equals(upgrade)) {
+ throw new FebsException("功能升级中");
+ }
if (transferDto.getType() != 2) {
member = dappMemberDao.selectById(member.getId());
@@ -130,7 +169,9 @@
throw new FebsException("Do not repeat purchase");
}
}
-
+ /**
+ * buyType=1,余额购买
+ */
if (transferDto.getBuyType() == 1) {
DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId());
if (transferDto.getAmount().compareTo(walletCoin.getAvailableAmount()) > 0) {
@@ -142,23 +183,149 @@
DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), transferDto.getAmount().negate(), 1, 2, transferDto.getFee(), transferDto.getTxHash());
dappFundFlowDao.insert(fundFlow);
- chainProducer.sendAchieveTreeMsg(member.getId());
+// chainProducer.sendAchieveTreeMsg(member.getId());
} else {
+ /**
+ * buyType=2,钱包购买
+ */
int type = 1;
// 1-认购 2-充值tfc
if (transferDto.getType() == 2) {
type = 6;
}
+ /**
+ * 第一次请求，生成一条资金流水ID，并且返回。
+ */
if (transferDto.getId() == null) {
- DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), transferDto.getAmount(), type, 1, transferDto.getFee(), transferDto.getTxHash());
+ /**
+ * 验证节点的价格是否和入参价格一致
+ */
+ String nodeCode = transferDto.getNodeCode();
+ DappNodeOrderEntity dappNodeOrderEntity = dappNodeOrderMapper.selectNodeOrderByNodeCodeForupdate(nodeCode);
+ BigDecimal price = dappNodeOrderEntity.getPrice();
+ BigDecimal amount = transferDto.getAmount();
+ if(price.compareTo(amount) != 0){
+ throw new FebsException("刷新后重试");
+// throw new FebsException("Refresh and try again");
+ }
+ Integer surplusCnt = dappNodeOrderEntity.getSurplusCnt();
+ if(0 >= surplusCnt){
+ throw new FebsException("该节点剩余数量为0。");
+ }
+
+
+ /**
+ * 超级节点只允许购买一次
+ */
+ if(NodeCodeEnum.SUPER_NODE.getCode().equals(nodeCode)){
+ DappMemberNodeEntity superNode = dappMemberNodeMapper.selectNodeByMemberIdAndNodeCode(
+ member.getId(), NodeCodeEnum.SUPER_NODE.getCode());
+ if(ObjectUtil.isNotEmpty(superNode)){
+ throw new FebsException("超级节点只能购买一次");
+ }
+ }
+
+ DappFundFlowEntity fundFlowOld = dappFundFlowDao.selectBymemberIdAndType(member.getId(),type,DappFundFlowEntity.WITHDRAW_STATUS_ING);
+ if(ObjectUtil.isNotEmpty(fundFlowOld)){
+ //网络问题导致第二次提交前，未成功就关闭了页面
+ if (fundFlowOld.getStatus() == 1 && StrUtil.isEmpty(fundFlowOld.getFromHash())) {
+ dappFundFlowDao.deleteById(fundFlowOld.getId());
+ throw new FebsException("Refresh and try again");
+ }
+ }
+ DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), transferDto.getAmount(), type, 1, transferDto.getFee(), transferDto.getTxHash(),transferDto.getNodeCode());
dappFundFlowDao.insert(fundFlow);
return fundFlow.getId();
}
if ("success".equals(transferDto.getFlag())) {
DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
+ if(DappFundFlowEntity.WITHDRAW_STATUS_AGREE == flow.getStatus()){
+ throw new FebsException("请勿重复提交");
+// throw new FebsException("Do not repeat purchase");
+ }
+ /**
+ * 生成会员节点表记录
+ */
+ String nodeCode = transferDto.getNodeCode();
+ DappNodeOrderEntity dappNodeOrderEntity = dappNodeOrderMapper.selectNodeOrderByNodeCodeForupdate(nodeCode);
+ DappMemberNodeEntity dappMemberNodeEntityNew = new DappMemberNodeEntity(
+ member.getId(),
+ dappNodeOrderEntity.getId(),
+ dappNodeOrderEntity.getNodeCode(),
+ transferDto.getAmount()
+ );
+ dappMemberNodeMapper.insert(dappMemberNodeEntityNew);
+
+ Integer surplusCnt = dappNodeOrderEntity.getSurplusCnt();
+ surplusCnt = surplusCnt - 1;
+ dappNodeOrderEntity.setSurplusCnt(surplusCnt);
+ dappNodeOrderMapper.updateById(dappNodeOrderEntity);
+
+ /**
+ * 流水关联用户购买节点记录
+ */
+ flow.setSystemProfitId(dappMemberNodeEntityNew.getId());
+ /**
+ * 链上转账的hash值
+ */
flow.setFromHash(transferDto.getTxHash());
+ flow.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
dappFundFlowDao.updateById(flow);
+ /**
+ * 升级账号类型为对应的节点名称
+ */
+// dappMemberDao.updateMemberAccountType(dappNodeOrderEntity.getNodeName(),member.getId());
+ /**
+ * 更新账号的状态为已激活-即已经购买节点
+ */
+// dappMemberDao.updateMemberActiveStatus(1,member.getId());
+ /**
+ * 直推奖励
+ */
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectById(member.getId());
+ String refererId = dappMemberEntity.getRefererId();
+ DappMemberEntity refererMember = dappMemberDao.selectMemberInfoByInviteId(refererId);
+ DataDictionaryCustom directProfitDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.DIRECT_PROFIT.getType(),
+ DataDictionaryEnum.DIRECT_PROFIT.getCode());
+ BigDecimal directProfitPercent = new BigDecimal(StrUtil.isEmpty(directProfitDic.getValue()) ? "0.1" : directProfitDic.getValue());
+ BigDecimal amount = transferDto.getAmount();
+ BigDecimal directProfit = amount.multiply(directProfitPercent).setScale(6,BigDecimal.ROUND_DOWN);
+ //生成直推奖励的流水
+ DappFundFlowEntity fundFlow = new DappFundFlowEntity(
+ refererMember.getId(),
+ directProfit,
+ 3,
+ 1,
+ BigDecimal.ZERO,
+ null,
+ dappMemberNodeEntityNew.getId());
+ dappFundFlowDao.insert(fundFlow);
+
+ /**
+ * 发送转币消息
+ */
+ chainProducer.sendBnbTransferMsg(fundFlow.getId());
+
+
+ BigDecimal subtract = amount.subtract(directProfit);
+
+ //生成直推奖励的流水
+ DappFundFlowEntity fundFlowEntityProject = new DappFundFlowEntity(
+ refererMember.getId(),
+ directProfit,
+ 4,
+ 1,
+ BigDecimal.ZERO,
+ null,
+ dappMemberNodeEntityNew.getId());
+ dappFundFlowDao.insert(fundFlowEntityProject);
+
+ /**
+ * 发送转币消息
+ */
+ chainProducer.sendBnbTransferMsg(fundFlowEntityProject.getId());
} else {
DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
if (flow.getStatus() == 1) {
@@ -171,13 +338,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 +361,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 +374,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
@@ -227,7 +408,7 @@
walletCoin.setAvailableAmount(walletCoin.getAvailableAmount().add(amount));
// 减
} else {
- if (amount.compareTo(walletCoin.getAvailableAmount()) < 0) {
+ if (amount.compareTo(walletCoin.getAvailableAmount()) > 0) {
throw new FebsException("Balance Not Enough");
}
walletCoin.setTotalAmount(walletCoin.getTotalAmount().subtract(amount));
@@ -252,7 +433,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 +445,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