From 595bd69cc70996087f499956840552aebc3d28b7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 19 May 2023 18:17:11 +0800
Subject: [PATCH] twoCoin项目修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 115 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 67 insertions(+), 48 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 1b009a0..4a13495 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,34 @@
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, amount);
+ if(StrUtil.isEmpty(hash)){
+ return;
+ }
+ log.info("{},{}",id,hash);
+ dappFundFlow.setFromHash(hash);
+ dappFundFlowDao.updateById(dappFundFlow);
+
+ }
+ }
+
+ public static void main(String[] args) {
+ BigDecimal amount = new BigDecimal(150);
+// BigDecimal divide = amount.multiply(new BigDecimal(100)).multiply(new BigDecimal(0.9)).setScale(2,BigDecimal.ROUND_DOWN);
+ BigDecimal divide = amount.multiply(new BigDecimal(100)).multiply(new BigDecimal(0.9)).setScale(2,BigDecimal.ROUND_DOWN);
+ System.out.println(divide);
}
@Override
@@ -547,41 +564,43 @@
@Override
public void bnbTransferTest(Long id) {
- DappFundFlowEntity dappFundFlow = dappFundFlowDao.selectById(id);
- if(ObjectUtil.isEmpty(dappFundFlow)){
+ log.info("{}",id);
+ //获取对应的流水记录
+ DappFundFlowEntity dappFundFlowEntity = dappFundFlowDao.selectInfoById(id);
+ if(ObjectUtil.isEmpty(dappFundFlowEntity)){
return;
}
- //用户已经加入动能队列
- DappSystemProfit dappSystemProfit = dappSystemProfitDao.selectById(dappFundFlow.getSystemProfitId()==null ? 0L : dappFundFlow.getSystemProfitId());
- if(ObjectUtil.isEmpty(dappSystemProfit)){
- return;
- }
- //金额
- BigDecimal amount = dappFundFlow.getAmount();
- //目标地址
- Long memberId = dappFundFlow.getMemberId();
+ Long memberId = dappFundFlowEntity.getMemberId();
DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
if(ObjectUtil.isEmpty(dappMemberEntity)){
return;
}
- String address = dappMemberEntity.getAddress();
- log.info("{}",address);
- BigInteger bigInteger = new BigInteger(Convert.toWei(amount.toString(), Convert.Unit.ETHER).setScale(0).toString());
- log.info("{}",bigInteger);
- String hash = contractMain.trans(bigInteger,address);
- if(StrUtil.isEmpty(hash)){
- 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 = dappMemberEntity.getAddress();
+ /**
+ * 发起USDT转账
+ */
+ String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(address, amount);
+ if(StrUtil.isEmpty(hash)){
+ return;
+ }
+ log.info("{},{}",id,hash);
+ dappFundFlow.setFromHash(hash);
+ dappFundFlowDao.updateById(dappFundFlow);
+
}
-
- dappFundFlow.setFromHash(hash);
- dappFundFlowDao.updateById(dappFundFlow);
}
- public static void main(String[] args) {
- String refererIds = "1,2,3,4,5," +
- "6,7,8,9,10," +
- "11,12,13,14,15";
- List<String> refererIdList = StrUtil.split(refererIds, ',');
- System.out.println(refererIdList);
- }
+// public static void main(String[] args) {
+// String refererIds = "1,2,3,4,5," +
+// "6,7,8,9,10," +
+// "11,12,13,14,15";
+// List<String> refererIdList = StrUtil.split(refererIds, ',');
+// System.out.println(refererIdList);
+// }
}
--
Gitblit v1.9.1