From 1041f9d218f170626a2af49fcaeb812b67ab31b8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 01 Dec 2022 15:56:48 +0800
Subject: [PATCH] 20221130
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 30 +++++++-------
src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java | 2
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 4 +-
src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java | 34 +++++++++++------
4 files changed, 40 insertions(+), 30 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java b/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java
index 4818423..3706f2a 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java
@@ -14,10 +14,15 @@
* 0x55d398326f99059fF775485246999027B3197955
* 测试链 0x337610d27c682E347C9cD60BD4b3b107C9d34dDd
*/
- BSC_USDT("BSC", "0xa9B85Fc19f3E330Cd703050fACA2110c7A33fd06",
- "0xb97d6046268b76a21c11c4b33357dc8e203542d7c2a7fc40fccf364099b06477",
+// BSC_USDT("BSC", "0xa9B85Fc19f3E330Cd703050fACA2110c7A33fd06",
+// "0xb97d6046268b76a21c11c4b33357dc8e203542d7c2a7fc40fccf364099b06477",
+// "https://bsc-dataseed1.ninicoin.io",
+// "0x55d398326f99059fF775485246999027B3197955",
+// ""),
+ BSC_USDT("BSC", "0xBa6206B3Be305278Ea65bA54C4E6188B252AEc4a",
+ "0x1bc264d17bd2b1f3c0480764272284b8e6c8b0a39a590c26940f84f7b090cc74",
"https://bsc-dataseed1.ninicoin.io",
- "0x55d398326f99059fF775485246999027B3197955",
+ "0xf11B0dA0b2784566279E7b988fBCbb366f5Aeb9e",
""),
/**
@@ -26,10 +31,10 @@
* 正式 0xb27e44f98543e480dbd071b6605005e3d99b3dd4 https://bsc-dataseed1.ninicoin.io
*
*/
- BSC_TFC("BSC", "0x0F22E63D2FB18963C57A5Cb3C43403d156D140c2",
- "0x5bd9f75f53693076e19a8f20d66a147bf0a438275463d2b8d85be8ab11780836",
+ BSC_TFC("BSC", "0x0F22E63D2FB18963C57A5Cb3C43403d156D140c2+1",
+ "0x5bd9f75f53693076e19a8f20d66a147bf0a438275463d2b8d85be8ab11780836+1",
"https://bsc-dataseed1.ninicoin.io",
- "0x9b4406bC2fa21d2058FD4939BAF29B3763cFeDe2",
+ "0x9b4406bC2fa21d2058FD4939BAF29B3763cFeDe2+1",
""),
/**
@@ -37,10 +42,15 @@
* 0x55d398326f99059fF775485246999027B3197955
* 测试链 0x337610d27c682E347C9cD60BD4b3b107C9d34dDd
*/
- BSC_USDT_LISTENER("BSC", "0xa9B85Fc19f3E330Cd703050fACA2110c7A33fd06",
- "0xb97d6046268b76a21c11c4b33357dc8e203542d7c2a7fc40fccf364099b06477",
+// BSC_USDT_LISTENER("BSC", "0xa9B85Fc19f3E330Cd703050fACA2110c7A33fd06+1",
+// "0xb97d6046268b76a21c11c4b33357dc8e203542d7c2a7fc40fccf364099b06477+1",
+// "https://bsc-dataseed1.ninicoin.io",
+// "0x55d398326f99059fF775485246999027B3197955+1",
+// ""),
+ BSC_USDT_LISTENER("BSC", "0xBa6206B3Be305278Ea65bA54C4E6188B252AEc4a",
+ "0x1bc264d17bd2b1f3c0480764272284b8e6c8b0a39a590c26940f84f7b090cc74",
"https://bsc-dataseed1.ninicoin.io",
- "0x55d398326f99059fF775485246999027B3197955",
+ "0xf11B0dA0b2784566279E7b988fBCbb366f5Aeb9e",
""),
/**
@@ -49,10 +59,10 @@
* 正式 0xb27e44f98543e480dbd071b6605005e3d99b3dd4 https://bsc-dataseed1.ninicoin.io
*
*/
- BSC_TFC_LISTENER("BSC", "0x0F22E63D2FB18963C57A5Cb3C43403d156D140c2",
- "0x5bd9f75f53693076e19a8f20d66a147bf0a438275463d2b8d85be8ab11780836",
+ BSC_TFC_LISTENER("BSC", "0x0F22E63D2FB18963C57A5Cb3C43403d156D140c2+1",
+ "0x5bd9f75f53693076e19a8f20d66a147bf0a438275463d2b8d85be8ab11780836+1",
"https://bsc-dataseed1.ninicoin.io",
- "0x9b4406bC2fa21d2058FD4939BAF29B3763cFeDe2",
+ "0x9b4406bC2fa21d2058FD4939BAF29B3763cFeDe2+1",
"");
diff --git a/src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java b/src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java
index cb25b7c..f88fb84 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java
@@ -183,7 +183,7 @@
// log.error("--->", error);
// });
- System.out.println(ChainService.getInstance(ChainEnum.BSC_TFC.name()).totalSupply());
+// System.out.println(ChainService.getInstance(ChainEnum.BSC_TFC.name()).totalSupply());
}
}
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 8a87b97..ace9945 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
@@ -362,7 +362,7 @@
//如果还有剩余给技术方
if(levelProfitTotal.compareTo(systemProfitTotal) > 0){
BigDecimal avaProfit = levelProfitTotal.subtract(systemProfit);
- DappFundFlowEntity fundFlow = new DappFundFlowEntity(memberId, avaProfit, 5, 1, BigDecimal.ZERO,null,dappSystemProfit.getId());
+ DappFundFlowEntity fundFlow = new DappFundFlowEntity(1L, avaProfit, 5, 1, BigDecimal.ZERO,null,dappSystemProfit.getId());
dappFundFlowDao.insert(fundFlow);
//发送转币消息
chainProducer.sendBnbTransferMsg(fundFlow.getId());
@@ -457,20 +457,20 @@
if(DappFundFlowEntity.WITHDRAW_STATUS_AGREE == dappFundFlowEntity.getStatus()){
return;
}
-// //金额
-// BigDecimal amount = dappFundFlowEntity.getAmount();
-// Long memberId = dappFundFlowEntity.getMemberId();
-// DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
-// if(ObjectUtil.isEmpty(dappMemberEntity)){
-// return;
-// }
-// //目标地址
-// String address = dappMemberEntity.getAddress();
-// String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(address, amount);
-// if(StrUtil.isEmpty(hash)){
-// return;
-// }
-// dappFundFlowEntity.setToHash(hash);
+ //金额
+ BigDecimal amount = dappFundFlowEntity.getAmount();
+ Long memberId = dappFundFlowEntity.getMemberId();
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
+ if(ObjectUtil.isEmpty(dappMemberEntity)){
+ return;
+ }
+ //目标地址
+ String address = dappMemberEntity.getAddress();
+ String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(address, amount);
+ if(StrUtil.isEmpty(hash)){
+ return;
+ }
+ dappFundFlowEntity.setToHash(hash);
dappFundFlowEntity.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
dappFundFlowDao.updateById(dappFundFlowEntity);
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
index 39bd4a6..f250aff 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -207,7 +207,7 @@
//直接拿走0.05个BNB放入技术方
DataDictionaryCustom systemProfit = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SYSTEM_PROFIT.getType(), DataDictionaryEnum.SYSTEM_PROFIT.getCode());
String systemProfitStr = StrUtil.isEmpty(systemProfit.getValue()) ? "0.05" : systemProfit.getValue();
- DappFundFlowEntity systemProfitFlow = new DappFundFlowEntity(member.getId(), new BigDecimal(systemProfitStr), 2, 1, BigDecimal.ZERO, transferDto.getTxHash(),dappSystemProfit.getId());
+ DappFundFlowEntity systemProfitFlow = new DappFundFlowEntity(1L, new BigDecimal(systemProfitStr), 2, 1, BigDecimal.ZERO, transferDto.getTxHash(),dappSystemProfit.getId());
dappFundFlowDao.insert(systemProfitFlow);
//发送转币消息
chainProducer.sendBnbTransferMsg(systemProfitFlow.getId());
@@ -426,7 +426,7 @@
//直接拿走0.05个BNB放入技术方
DataDictionaryCustom systemProfit = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SYSTEM_PROFIT.getType(), DataDictionaryEnum.SYSTEM_PROFIT.getCode());
String systemProfitStr = StrUtil.isEmpty(systemProfit.getValue()) ? "0.05" : systemProfit.getValue();
- DappFundFlowEntity systemProfitFlow = new DappFundFlowEntity(member.getId(), new BigDecimal(systemProfitStr), 2, 1, BigDecimal.ZERO, transferDto.getTxHash(),dappSystemProfit.getId());
+ DappFundFlowEntity systemProfitFlow = new DappFundFlowEntity(1L, new BigDecimal(systemProfitStr), 2, 1, BigDecimal.ZERO, transferDto.getTxHash(),dappSystemProfit.getId());
dappFundFlowDao.insert(systemProfitFlow);
//发送转币消息
chainProducer.sendBnbTransferMsg(systemProfitFlow.getId());
--
Gitblit v1.9.1