From ed4d8807978a6eed32d2b2e1273fdcaa89c6d9a4 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 09 May 2024 17:38:14 +0800
Subject: [PATCH] 合约监听
---
src/main/java/cc/mrbird/febs/dapp/service/impl/BscCoinContractEvent.java | 14 +++++++-------
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/BscCoinContractEvent.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/BscCoinContractEvent.java
index 3900f4a..9a16ed0 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/BscCoinContractEvent.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/BscCoinContractEvent.java
@@ -195,16 +195,16 @@
return;
}
int decimals = ChainService.getInstance(ChainEnum.BSC_GFA.name()).decimals();
- BigDecimal amount = new BigDecimal(e.amount.toString()).divide(BigDecimal.TEN.pow(decimals), decimals, RoundingMode.HALF_DOWN);
- BigDecimal price = new BigDecimal(e.price.toString()).divide(BigDecimal.TEN.pow(decimals), decimals, RoundingMode.HALF_DOWN);
- BigDecimal usdtTarget = new BigDecimal(e.usdtTarget.toString()).divide(BigDecimal.TEN.pow(decimals), decimals, RoundingMode.HALF_DOWN);
- BigDecimal coinTarget = new BigDecimal(e.coinTarget.toString()).divide(BigDecimal.TEN.pow(decimals), decimals, RoundingMode.HALF_DOWN);
- BigDecimal usdtCoin = new BigDecimal(e.usdtCoin.toString()).divide(BigDecimal.TEN.pow(decimals), decimals, RoundingMode.HALF_DOWN);
+ BigDecimal amount = new BigDecimal(e.amount.toString()).divide(BigDecimal.TEN.pow(decimals), decimals, RoundingMode.HALF_DOWN).setScale(8,BigDecimal.ROUND_DOWN);
+ BigDecimal price = new BigDecimal(e.price.toString()).divide(BigDecimal.TEN.pow(decimals), decimals, RoundingMode.HALF_DOWN).setScale(8,BigDecimal.ROUND_DOWN);
+ BigDecimal usdtTarget = new BigDecimal(e.usdtTarget.toString()).divide(BigDecimal.TEN.pow(decimals), decimals, RoundingMode.HALF_DOWN).setScale(8,BigDecimal.ROUND_DOWN);
+ BigDecimal coinTarget = new BigDecimal(e.coinTarget.toString()).divide(BigDecimal.TEN.pow(decimals), decimals, RoundingMode.HALF_DOWN).setScale(8,BigDecimal.ROUND_DOWN);
+ BigDecimal usdtCoin = new BigDecimal(e.usdtCoin.toString()).divide(BigDecimal.TEN.pow(decimals), decimals, RoundingMode.HALF_DOWN).setScale(8,BigDecimal.ROUND_DOWN);
BigInteger lastMineTime = e.lastMineTime;
QueryWrapper<DappMemberFund> objectQueryWrapper = new QueryWrapper<>();
- objectQueryWrapper.eq("block_hash",blockHash);
- objectQueryWrapper.eq("address",address);
+// objectQueryWrapper.eq("block_hash",blockHash);
+// objectQueryWrapper.eq("address",address);
objectQueryWrapper.eq("price",price);
objectQueryWrapper.eq("usdt_target",usdtTarget);
objectQueryWrapper.eq("coin_target",coinTarget);
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 6477d88..1161fdd 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
@@ -108,12 +108,12 @@
BigDecimal coinAmount = dappAchieves.stream().map(DappAchieve::getCoinAmount).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(8,BigDecimal.ROUND_DOWN);
BigDecimal goldAmountAva = goldAmount.subtract(goldAmountDone);//金本位剩余
BigDecimal coinAmountAva = coinAmount.subtract(coinAmountDone);//币本位剩余
- if(goldAmountAva.compareTo(BigDecimal.ZERO) > 0){
+ if(goldAmountAva.compareTo(new BigDecimal(0.001)) > 0){
walletInfo.setGoldAmount(goldAmountAva);
}else{
walletInfo.setGoldAmount(BigDecimal.ZERO);
}
- if(coinAmountAva.compareTo(BigDecimal.ZERO) > 0){
+ if(coinAmountAva.compareTo(new BigDecimal(0.001)) > 0){
walletInfo.setCoinAmount(coinAmountAva);
}else{
walletInfo.setCoinAmount(BigDecimal.ZERO);
--
Gitblit v1.9.1