From 43061815fcd4e100fdef15d3b277acc883668877 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 15 May 2024 17:36:20 +0800
Subject: [PATCH] 错误流水恢复
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
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 de7a9cb..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
@@ -87,10 +87,9 @@
BigDecimal ccToday = BigDecimal.ZERO;
if(CollUtil.isNotEmpty(ccTodays)){
for(DappMemberFund dappMemberFund : ccTodays){
- BigDecimal sameCoin = dappMemberFund.getSameCoin();
- BigDecimal finxMineCoin = dappMemberFund.getFinxMineCoin();
- BigDecimal price = dappMemberFund.getPrice();
- BigDecimal add = sameCoin.divide(price, 8, BigDecimal.ROUND_DOWN).add(finxMineCoin);
+ BigDecimal usdtCoin = dappMemberFund.getUsdtCoin();
+ BigDecimal coinTarget = dappMemberFund.getCoinTarget();
+ BigDecimal add = coinTarget.add(usdtCoin);
ccToday = ccToday.add(add);
}
}
@@ -109,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