From a9fbfbd5dbabcad09cd06e4b07cda8c5a01183ff Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 09 Apr 2021 18:44:53 +0800
Subject: [PATCH] Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity
---
src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java b/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
index 0773265..ed5539c 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
@@ -453,19 +453,21 @@
String walletCode = MemberWalletCoinEnum.WALLETCOINCODE.getValue();
MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberId, symbol);
BigDecimal availableBalance = walletContract.getAvailableBalance();
+
+ BigDecimal canReduce = availableBalance;
//可用减去盈亏
if(totalProfitOrLess.compareTo(BigDecimal.ZERO) < 0){
- availableBalance = availableBalance.add(totalProfitOrLess);
+ canReduce = availableBalance.add(totalProfitOrLess);
}
// 扣币
- BigDecimal availableSubtract = availableBalance.subtract(balance);
+ BigDecimal availableSubtract = canReduce.subtract(balance);
if (availableSubtract.compareTo(BigDecimal.ZERO) < 0) {
return Result.fail(MessageSourceUtils.getString("member_service_0007"));
}
BigDecimal totalBalance = walletContract.getTotalBalance();
BigDecimal totalSubtract = totalBalance.subtract(balance);
- walletContract.setAvailableBalance(availableSubtract.add(totalProfitOrLess));
+ walletContract.setAvailableBalance(availableBalance.subtract(balance));
walletContract.setTotalBalance(totalSubtract);
int updateWalletCoinById = memberWalletContractDao.updateById(walletContract);
if (updateWalletCoinById < 1) {
--
Gitblit v1.9.1