From 94f18c6cae352c9ccb7ea4abceef6db586709dcf Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 19 May 2023 18:28:49 +0800
Subject: [PATCH] twoCoin项目修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 72 ++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 35 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 ee192bc..5a310a3 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
@@ -483,14 +483,22 @@
/**
* 发起USDT转账
*/
- String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(address, new BigDecimal(0.1));
+ 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
@@ -556,47 +564,41 @@
@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;
}
- 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();
- //目标地址
- 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("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);
- if(StrUtil.isEmpty(hash)){
- return;
+ if(AppContants.ADDRESS_PEOJECT.equals(dappMemberEntity.getAddress())){
+ 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