From 3d0a5198eed48ffeb71e83bfe3b91b415384c91d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 19 May 2023 14:09:37 +0800
Subject: [PATCH] twoCoin项目修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 49 ++++++++++++++++++++++++++++++-------------------
1 files changed, 30 insertions(+), 19 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 62cc0f6..ee192bc 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,7 +356,9 @@
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);
@@ -467,21 +471,26 @@
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转账
+ */
+ String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(address, new BigDecimal(0.1));
+ if(StrUtil.isEmpty(hash)){
+ return;
+ }
+ log.info("{},{}",id,hash);
+ dappFundFlow.setFromHash(hash);
+ dappFundFlowDao.updateById(dappFundFlow);
+ }
}
@Override
@@ -554,9 +563,11 @@
if(DappFundFlowEntity.WITHDRAW_STATUS_ING != dappFundFlow.getIsReturn()){
return;
}
- //用户已经加入动能队列
- DappSystemProfit dappSystemProfit = dappSystemProfitDao.selectById(dappFundFlow.getSystemProfitId()==null ? 0L : dappFundFlow.getSystemProfitId());
- if(ObjectUtil.isEmpty(dappSystemProfit)){
+ /**
+ * 用户是否已经生成节点购买记录
+ */
+ DappMemberNodeEntity dappMemberNodeEntity = dappMemberNodeMapper.selectById(dappFundFlow.getSystemProfitId() == null ? 0L : dappFundFlow.getSystemProfitId());
+ if(ObjectUtil.isEmpty(dappMemberNodeEntity)){
return;
}
//金额
--
Gitblit v1.9.1