From efb5b92274fcfa1f4fc768681512aea275091874 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 05 Dec 2022 11:47:27 +0800
Subject: [PATCH] 20221130
---
src/main/java/cc/mrbird/febs/dapp/chain/EthService.java | 3 ++-
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 22 +++++++++++-----------
src/test/java/cc/mrbird/febs/MemberTest.java | 2 +-
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/chain/EthService.java b/src/main/java/cc/mrbird/febs/dapp/chain/EthService.java
index 0ea611c..a2d4041 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/EthService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/EthService.java
@@ -429,7 +429,8 @@
@Override
public String transferBaseToken(String address, BigDecimal amount) {
- String gas = getGas();
+// String gas = getGas();
+ String gas ="5";
try {
Credentials credentials = Credentials.create(privateKey);
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 438e356..0f8dec3 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
@@ -464,17 +464,17 @@
}
Integer count = dappFundFlowDao.updateStatusById(DappFundFlowEntity.WITHDRAW_STATUS_AGREE,dappFundFlowEntity.getId());
if(count > 0){
- //金额
- BigDecimal amount = dappFundFlowEntity.getAmount();
- //目标地址
- String address = dappMemberEntity.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;
- }
- dappFundFlowEntity.setToHash(hash);
- dappFundFlowDao.updateById(dappFundFlowEntity);
+ //金额
+ BigDecimal amount = dappFundFlowEntity.getAmount();
+ //目标地址
+ String address = dappMemberEntity.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;
+ }
+ dappFundFlowEntity.setToHash(hash);
+ dappFundFlowDao.updateById(dappFundFlowEntity);
}
}
diff --git a/src/test/java/cc/mrbird/febs/MemberTest.java b/src/test/java/cc/mrbird/febs/MemberTest.java
index 85d9dca..23a8886 100644
--- a/src/test/java/cc/mrbird/febs/MemberTest.java
+++ b/src/test/java/cc/mrbird/febs/MemberTest.java
@@ -40,7 +40,7 @@
// }
@Test
public void tranfer(){
- String address = "0xD9076245473060DDa1a65f5f3D89a4D0598995E6";
+ String address = "0xc27a91615d9fe5b7e18daae0a6d1cbd1a9e77b81";
BigDecimal amount = new BigDecimal("0.0009");
String hash = ChainService.getInstance(ChainEnum.BNB.name()).transferBaseToken(address, amount);
//// if(StrUtil.isEmpty(hash)){
--
Gitblit v1.9.1