From 46b5c6fe9ec89d25565b86f71ccfb299a9aafd40 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 28 Aug 2022 00:30:14 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/chain/ChainEnumBak.java | 16 ++++++++++++----
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 11 +++++------
src/main/java/cc/mrbird/febs/job/SystemTradeJob.java | 2 +-
src/main/java/cc/mrbird/febs/rabbit/producer/ChainProducer.java | 1 -
4 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnumBak.java b/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnumBak.java
index d74945c..4c5690b 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnumBak.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnumBak.java
@@ -5,7 +5,6 @@
/**
* 链类型
*/
-@Deprecated
@Getter
public enum ChainEnumBak {
/**
@@ -59,8 +58,8 @@
/**
* 源池U
*/
- BSC_USDT_SOURCE("BSC", "0x4EbDCA102623b46a47042D580dddAdE2a53D057F",
- "0x81c2c02d0c106c1e32ab060a37f6eb279c0649c30ea5cc1c4951e6a8dd4e963c",
+ BSC_USDT_SOURCE("BSC", "0x977a9ddfb965a9a3416fa72ca7f91c4949c18f25",
+ "0xefe98e00cd227b6322e892c82fcbd8eadf119c3188b7e574bc624f65405d61bf",
"https://bsc-dataseed1.ninicoin.io",
"0x46Ac4921e58773ca22826DF1640672B91B1DB2B3",
""),
@@ -119,7 +118,16 @@
* 正式 0xb27e44f98543e480dbd071b6605005e3d99b3dd4 https://bsc-dataseed1.ninicoin.io
*
*/
- BSC_TFC_LISTENER("BSC", "0x977a9ddfb965a9a3416fa72ca7f91c4949c18f25",
+ BSC_TFC_LISTENER("BSC", "0x4EbDCA102623b46a47042D580dddAdE2a53D057F",
+ "0x81c2c02d0c106c1e32ab060a37f6eb279c0649c30ea5cc1c4951e6a8dd4e963c",
+ "https://bsc-dataseed1.ninicoin.io",
+ "0x6c6835e60e7dBaD7a60112a6371271e8eb79ee68",
+ ""),
+
+ /**
+ * 多余手续费收集地址
+ */
+ BSC_TFC_FEE("BSC", "0x977a9ddfb965a9a3416fa72ca7f91c4949c18f25",
"0xefe98e00cd227b6322e892c82fcbd8eadf119c3188b7e574bc624f65405d61bf",
"https://bsc-dataseed1.ninicoin.io",
"0x6c6835e60e7dBaD7a60112a6371271e8eb79ee68",
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 1c7517e..44f099b 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
@@ -765,7 +765,7 @@
BigDecimal cardProfit = totalFee.multiply(new BigDecimal("0.5"));
BigDecimal destroy = totalFee.subtract(cardProfit);
- BigDecimal preFee = cardProfit.divide(BigDecimal.valueOf(5000), 2, RoundingMode.HALF_UP);
+ BigDecimal preFee = cardProfit.divide(BigDecimal.valueOf(5000), ChainService.getInstance(ChainEnum.BSC_TFC.name()).decimals(), RoundingMode.HALF_UP);
Map<String, Integer> cardCntMap = nfcCardMap();
if (!cardCntMap.isEmpty()) {
@@ -773,14 +773,13 @@
BigDecimal amount = preFee.multiply(new BigDecimal(entry.getValue()));
DappMemberEntity member = dappMemberDao.selectByAddress(entry.getKey(), "BSC");
+ if (member == null) {
+ continue;
+ }
DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), amount, 4, 1, null, null);
dappFundFlowDao.insert(fundFlow);
OnlineTransferUtil.addTransfer(entry.getKey(), amount, 5, 1, ChainEnum.BSC_TFC_FEE.name(), AppContants.SYMBOL_COIN, batchNo);
-
- Map<String, Object> map = new HashMap<>();
- map.put("batchNo", batchNo);
- chainProducer.sendOnlineTransfer(JSONObject.toJSONString(map));
}
}
@@ -793,7 +792,7 @@
private Map<String, Integer> nfcCardMap() {
ContractChainService nftInstance = ChainService.getInstance(ChainEnum.BSC_NFT_SDC.name());
- BigInteger totalNFT = nftInstance.totalSupply();
+ BigInteger totalNFT = nftInstance.totalSupplyNFT();
Map<String, Integer> cardCntMap = new HashMap<>();
for (int i = 0; i < totalNFT.intValue(); i++) {
diff --git a/src/main/java/cc/mrbird/febs/job/SystemTradeJob.java b/src/main/java/cc/mrbird/febs/job/SystemTradeJob.java
index 4f1cad9..1bf4f28 100644
--- a/src/main/java/cc/mrbird/febs/job/SystemTradeJob.java
+++ b/src/main/java/cc/mrbird/febs/job/SystemTradeJob.java
@@ -69,7 +69,7 @@
systemService.mining();
}
- @Scheduled(cron = "0/10 * * * * ?")
+// @Scheduled(cron = "0/10 * * * * ?")
public void tfcNewPriceJob() {
systemService.tfcNewPrice();
}
diff --git a/src/main/java/cc/mrbird/febs/rabbit/producer/ChainProducer.java b/src/main/java/cc/mrbird/febs/rabbit/producer/ChainProducer.java
index 4b6b813..434cdf9 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/producer/ChainProducer.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/producer/ChainProducer.java
@@ -62,7 +62,6 @@
* @param data
*/
public void sendTfcNewPrice(String data) {
- log.info("发送tfc最新价:{}", data);
CorrelationData correlationData = new CorrelationData(UUID.randomUUID().toString());
rabbitTemplate.convertAndSend(QueueEnum.TFC_NEW_PRICE.getExchange(), QueueEnum.TFC_NEW_PRICE.getRoute(), data, correlationData);
}
--
Gitblit v1.9.1