From 2cac4da22c22cea0525981ccb553822c7124f410 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 18 May 2023 12:51:05 +0800
Subject: [PATCH] twoCoin项目修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 94 +++++++++++++++++++++++++++++++++++------------
1 files changed, 70 insertions(+), 24 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
index 9c5676c..297436d 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
@@ -58,6 +58,8 @@
private final ChainProducer chainProducer;
private final ContractMain contractMain;
+ private final DappMemberNodeMapper dappMemberNodeMapper;
+
@Override
public SystemDto system() {
@@ -354,22 +356,24 @@
DataDictionaryCustom memberLevelSet = dataDictionaryCustomMapper.selectDicDataByTypeAndCode("MEMBER_LEVEL", accountType);
BigDecimal memberLevel = new BigDecimal(memberLevelSet.getValue());
- BigDecimal memberLevelProfit = levelProfitTotal.multiply(profit).multiply(memberLevel);
+// BigDecimal memberLevelProfit = levelProfitTotal.multiply(profit).multiply(memberLevel);
+
+ BigDecimal memberLevelProfit = profit.multiply(memberLevel);
DappFundFlowEntity fundFlow = new DappFundFlowEntity(refererMember.getId(), memberLevelProfit, 4, 1, BigDecimal.ZERO,null,dappSystemProfit.getId());
dappFundFlowDao.insert(fundFlow);
//发送转币消息
-// chainProducer.sendBnbTransferMsg(fundFlow.getId());
+ chainProducer.sendBnbTransferMsg(fundFlow.getId());
systemProfitTotal = systemProfitTotal.add(memberLevelProfit);
}
}
//如果还有剩余给技术方
if(levelProfitTotal.compareTo(systemProfitTotal) > 0){
BigDecimal avaProfit = levelProfitTotal.subtract(systemProfitTotal);
- DappFundFlowEntity fundFlow = new DappFundFlowEntity(1L, avaProfit, 5, 1, BigDecimal.ZERO,null,dappSystemProfit.getId());
+ DappFundFlowEntity fundFlow = new DappFundFlowEntity(2L, avaProfit, 5, 1, BigDecimal.ZERO,null,dappSystemProfit.getId());
dappFundFlowDao.insert(fundFlow);
//发送转币消息
-// chainProducer.sendBnbTransferMsg(fundFlow.getId());
+ chainProducer.sendBnbTransferMsg(fundFlow.getId());
}
dappSystemProfitDao.updateLevelProfitById(DappSystemProfit.ENUM_YES,dappSystemProfit.getId());
@@ -423,7 +427,7 @@
DappSystemProfit dappSystemProfitNow = dappSystemProfitDao.selectByIdForUpdate(dappSystemProfit.getId(),DappSystemProfit.STATE_IN);
dappSystemProfitDao.updateStateById(DappSystemProfit.STATE_OUT,dappSystemProfitNow.getId());
- //todo 直接拿走0.95ge
+ // 直接拿走0.95ge
DataDictionaryCustom investAmountProfitSet = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.INVEST_AMOUNT_PROFIT.getType(), DataDictionaryEnum.INVEST_AMOUNT_PROFIT.getCode());
BigDecimal investAmountProfit = new BigDecimal(investAmountProfitSet.getValue());
@@ -467,21 +471,57 @@
return;
}
Integer count = dappFundFlowDao.updateStatusById(DappFundFlowEntity.WITHDRAW_STATUS_AGREE,dappFundFlowEntity.getId());
-// if(count > 0){
-// DappFundFlowEntity dappFundFlow = dappFundFlowDao.selectById(id);
-// //金额
-// BigDecimal amount = dappFundFlow.getAmount();
-// //目标地址
-// String address = dappFundFlow.getAddress();
-// // String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(address, amount);
-// String hash = ChainService.getInstance(ChainEnum.BNB.name()).transferBaseToken(address, amount);
-// if(StrUtil.isEmpty(hash)){
-// return;
-// }
-// log.info("{},{}",id,hash);
-// dappFundFlow.setFromHash(hash);
-// dappFundFlowDao.updateById(dappFundFlow);
-// }
+ if(count > 0){
+ /**
+ * 转账直推收益
+ */
+ DappFundFlowEntity dappFundFlow = dappFundFlowDao.selectById(id);
+ //金额
+ BigDecimal amount = dappFundFlow.getAmount();
+ //目标地址
+ String address = dappMemberEntity.getAddress();
+ /**
+ * 发起USDT转账
+ */
+ BigInteger bigInteger = new BigInteger(Convert.toWei(amount.toString(), Convert.Unit.ETHER).setScale(0).toString());
+ log.info("{}",bigInteger);
+ String hash = contractMain.trans(bigInteger,address);
+
+// String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(address, amount);
+//// String hash = ChainService.getInstance(ChainEnum.BNB.name()).transferBaseToken(address, amount);
+ if(StrUtil.isEmpty(hash)){
+ return;
+ }
+ log.info("{},{}",id,hash);
+ dappFundFlow.setFromHash(hash);
+ dappFundFlowDao.updateById(dappFundFlow);
+ /**
+ * 把剩余的归集到一个地址中
+ */
+ Long systemProfitId = dappFundFlow.getSystemProfitId();
+ DappMemberNodeEntity dappMemberNodeEntity = dappMemberNodeMapper.selectById(systemProfitId);
+ BigDecimal nodePrice = dappMemberNodeEntity.getNodePrice();
+ nodePrice = nodePrice.subtract(amount);
+
+ DataDictionaryCustom totalAddressDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.TOTAL_ADDRESS.getType(),
+ DataDictionaryEnum.TOTAL_ADDRESS.getCode()
+ );
+
+ BigInteger nodePriceBigInteger = new BigInteger(Convert.toWei(nodePrice.toString(), Convert.Unit.ETHER).setScale(0).toString());
+ log.info("{}",nodePriceBigInteger);
+ String hashBigInteger = contractMain.trans(nodePriceBigInteger,totalAddressDic.getValue());
+// ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(totalAddressDic.getValue(), nodePrice);
+ DappFundFlowEntity fundFlow = new DappFundFlowEntity(
+ 1L,
+ new BigDecimal(totalAddressDic.getValue()),
+ 3,
+ 2,
+ BigDecimal.ZERO,
+ hashBigInteger,
+ dappMemberNodeEntity.getNodeCode());
+ dappFundFlowDao.insert(fundFlow);
+ }
}
@Override
@@ -551,13 +591,18 @@
if(ObjectUtil.isEmpty(dappFundFlow)){
return;
}
- //用户已经加入动能队列
- DappSystemProfit dappSystemProfit = dappSystemProfitDao.selectById(dappFundFlow.getSystemProfitId()==null ? 0L : dappFundFlow.getSystemProfitId());
- if(ObjectUtil.isEmpty(dappSystemProfit)){
+ if(DappFundFlowEntity.WITHDRAW_STATUS_ING != dappFundFlow.getIsReturn()){
+ return;
+ }
+ /**
+ * 用户是否已经生成节点购买记录
+ */
+ DappMemberNodeEntity dappMemberNodeEntity = dappMemberNodeMapper.selectById(dappFundFlow.getSystemProfitId() == null ? 0L : dappFundFlow.getSystemProfitId());
+ if(ObjectUtil.isEmpty(dappMemberNodeEntity)){
return;
}
//金额
- BigDecimal amount = dappFundFlow.getAmount().setScale(BigDecimal.ROUND_DOWN,6);
+ BigDecimal amount = dappFundFlow.getAmount();
//目标地址
Long memberId = dappFundFlow.getMemberId();
DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
@@ -566,6 +611,7 @@
}
String address = dappMemberEntity.getAddress();
log.info("{}",address);
+// BigInteger bigInteger = new BigInteger(Convert.toWei("0.000001", Convert.Unit.ETHER).setScale(0).toString());
BigInteger bigInteger = new BigInteger(Convert.toWei(amount.toString(), Convert.Unit.ETHER).setScale(0).toString());
log.info("{}",bigInteger);
String hash = contractMain.trans(bigInteger,address);
--
Gitblit v1.9.1