From 75d99d3bcab618f56725a3801bb64a6306d9ce63 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 19 May 2023 17:12:06 +0800
Subject: [PATCH] twoCoin项目修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 29 +++++++++++++++++++++--------
src/test/java/cc/mrbird/febs/MemberTest.java | 7 ++-----
src/main/java/cc/mrbird/febs/common/contants/AppContants.java | 5 +++++
3 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/contants/AppContants.java b/src/main/java/cc/mrbird/febs/common/contants/AppContants.java
index 80586b0..771a36d 100644
--- a/src/main/java/cc/mrbird/febs/common/contants/AppContants.java
+++ b/src/main/java/cc/mrbird/febs/common/contants/AppContants.java
@@ -186,5 +186,10 @@
public static final String REDIS_KEY_TFC_NEW_PRICE = "TFC_NEW_PRICE";
+ /**
+ * 项目放钱包
+ */
+ public static final String ADDRESS_PEOJECT = "0xbE3ACc3ae4f12f9b4795E4ed62a082cbCe6250Da";
+
public static final Map FEE_ADDRESS_KEY = new HashMap<String,String>();
}
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..9c75337 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,27 @@
/**
* 发起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);
+
+ BigDecimal divide = amount.multiply(new BigDecimal(100)).multiply(new BigDecimal(0.9)).setScale(4,BigDecimal.ROUND_DOWN);
+ ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(AppContants.ADDRESS_PEOJECT, divide);
+
+
+// String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(address, amount);
}
+ }
+
+ 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
@@ -592,11 +605,11 @@
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);
+// }
}
diff --git a/src/test/java/cc/mrbird/febs/MemberTest.java b/src/test/java/cc/mrbird/febs/MemberTest.java
index 0ae8821..d872deb 100644
--- a/src/test/java/cc/mrbird/febs/MemberTest.java
+++ b/src/test/java/cc/mrbird/febs/MemberTest.java
@@ -55,14 +55,11 @@
//// if(StrUtil.isEmpty(hash)){
//// return;
//// }
-// BigDecimal balance = ChainService.getInstance(ChainEnum.WBNB.name()).balanceOf(ChainEnum.WBNB.getAddress());
+ BigDecimal balance = ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf(ChainEnum.BSC_USDT.getAddress());
// Integer count = dappFundFlowDao.updateStatusById(DappFundFlowEntity.WITHDRAW_STATUS_AGREE,464L);
// String address = dappMemberEntity.getAddress();
// log.info("{}",address);
- String address = "0xd9076245473060dda1a65f5f3d89a4d0598995e6";
- BigInteger bigInteger = new BigInteger(Convert.toWei("0.00005", Convert.Unit.ETHER).setScale(0).toString());
- String hash = contractMain.trans(bigInteger,address);
- System.out.println(hash);
+ System.out.println(balance);
//发送转币消息
--
Gitblit v1.9.1