From 807abaa768db7dc8605216abffdb185739bb2d2e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 29 Aug 2022 12:41:32 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 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 1c7517e..26a0afe 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
@@ -721,7 +721,6 @@
public boolean systemHasStart() {
String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG);
if (!"start".equals(hasStart)) {
- log.info("系统未启动");
return false;
}
@@ -759,13 +758,20 @@
*/
@Override
public void sdmWithdrawFee(String data) {
- BigDecimal totalFee = new BigDecimal(data);
+ JSONObject jsonObject = JSONObject.parseObject(data);
+
+ String address = jsonObject.getString("address");
+ if (!ChainEnum.BSC_TFC_FEE.getAddress().equals(address)) {
+ return;
+ }
+
+ BigDecimal totalFee = new BigDecimal(jsonObject.getString("fee"));
String batchNo = RandomUtil.randomString(16);
- BigDecimal cardProfit = totalFee.multiply(new BigDecimal("0.5"));
+ BigDecimal cardProfit = totalFee.multiply(new BigDecimal("0.4"));
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 +779,13 @@
BigDecimal amount = preFee.multiply(new BigDecimal(entry.getValue()));
DappMemberEntity member = dappMemberDao.selectByAddress(entry.getKey(), "BSC");
- DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), amount, 4, 1, null, null);
+ if (member == null) {
+ continue;
+ }
+ DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), amount, 4, 2, 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 +798,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++) {
--
Gitblit v1.9.1