From efbff9ca8ef6bdf2966f80fe05984ed45b1b8519 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Nov 2022 16:29:41 +0800
Subject: [PATCH] 20221124
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 42 insertions(+), 8 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 1b4574b..341b391 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
@@ -23,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;
@@ -59,6 +61,7 @@
private final ChainProducer chainProducer;
private final DappSystemDao dappSystemDao;
+ private final DappSystemProfitDao dappSystemProfitDao;
@Override
public WalletInfoVo walletInfo() {
@@ -66,7 +69,7 @@
DappMemberEntity memberInfo = dappMemberDao.selectById(member.getId());
WalletInfoVo walletInfo = new WalletInfoVo();
- List<DappMemberEntity> direct = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 1, null);
+ List<DappMemberEntity> direct = dappMemberDao.selectChildMemberDirectOrNot(member.getInviteId(), 1, 1);
DappWalletCoinEntity walletCoin = dappWalletCoinDao.selectByMemberId(member.getId());
DappWalletMineEntity walletMine = dappWalletMineDao.selectByMemberId(member.getId());
@@ -92,7 +95,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();
@@ -122,6 +125,11 @@
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();
@@ -163,9 +171,34 @@
}
if ("success".equals(transferDto.getFlag())) {
+ //插入一条会员入列记录,即加入动能队列
+ 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());
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(member.getId(), new BigDecimal(systemProfitStr), 2, 2, BigDecimal.ZERO, transferDto.getTxHash(),dappSystemProfit.getId());
+ dappFundFlowDao.insert(systemProfitFlow);
+ //直接返利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(BigDecimal.ROUND_DOWN, 2);
+
+ DappFundFlowEntity fundFlow = new DappFundFlowEntity(refererMember.getId(), directProfit, 3, 2, BigDecimal.ZERO, transferDto.getTxHash(),dappSystemProfit.getId());
+ dappFundFlowDao.insert(fundFlow);
+ //层级奖励30%
+ chainProducer.sendLevelProfitMsg(dappSystemProfit.getId());
+ //发送一个消息，计算当前是否有人可以出局
+
} else {
DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
if (flow.getStatus() == 1) {
@@ -186,7 +219,7 @@
if (priceDto.getAmount() == null) {
amount = BigDecimal.ZERO;
}
- return amount.multiply(new BigDecimal(serviceFeeDic.getValue()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_DOWN)).divide(new BigDecimal(symbolPrice.getValue()), 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
@@ -211,7 +244,7 @@
DappFundFlowEntity feeFlow = new DappFundFlowEntity(member.getId(), withdrawDto.getFee().negate(), 7, 2, null, null);
dappFundFlowDao.insert(feeFlow);
- DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), withdrawDto.getAmount().negate(), 5, 1, withdrawDto.getFee(), null);
+ DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), withdrawDto.getAmount().negate(), 5, 2, withdrawDto.getFee(), null);
dappFundFlowDao.insert(fundFlow);
MemberCoinWithdrawEntity memberCoinWithdraw = new MemberCoinWithdrawEntity();
@@ -219,15 +252,16 @@
memberCoinWithdraw.setAddress(member.getAddress());
memberCoinWithdraw.setAmount(withdrawDto.getAmount());
memberCoinWithdraw.setFeeAmount(withdrawDto.getFee());
- memberCoinWithdraw.setStatus(MemberCoinWithdrawEntity.STATUS_DOING);
+ 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);
+ String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(member.getAddress(), withdrawDto.getAmount());
+ fundFlow.setToHash(hash);
+ dappFundFlowDao.updateById(fundFlow);
+ chainProducer.sendFeeDistributeMsg(fundFlow.getId());
// Map<String, Object> map = new HashMap<>();
// map.put("fee", withdrawDto.getFee());
// map.put("address", ChainEnum.BSC_TFC_FEE.getAddress());
--
Gitblit v1.9.1