From 36be00e0f3cbe0d559c646fd2977e6e3a74aa6f9 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 30 Sep 2024 16:57:22 +0800
Subject: [PATCH] Merge branch 'bea' of http://120.27.238.55:7000/r/exchange into bea
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java
index 2c21e84..c335ebd 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java
@@ -137,16 +137,18 @@
BigDecimal totalAmount = modifyDto.getUnitPrice().multiply(modifyDto.getAmount());
otcEntrustOrder.setTotalAmount(totalAmount);
+
+ BigDecimal remainAmount = prevEntity.getRemainCoinAmount();
if (OtcEntrustOrder.ORDER_TYPE_S.equals(modifyDto.getType())) {
MemberWalletCoinEntity coinWallet = memberWalletCoinDao.selectWalletCoinBymIdAndCode(member.getId(), "USDT");
- coinWallet.setAvailableBalance(coinWallet.getAvailableBalance().add(otcEntrustOrder.getRemainCoinAmount()));
- if(coinWallet.getAvailableBalance().compareTo(totalAmount) < 0) {
+ coinWallet.setAvailableBalance(coinWallet.getAvailableBalance().add(remainAmount));
+ if(coinWallet.getAvailableBalance().compareTo(modifyDto.getAmount()) < 0) {
throw new GlobalException("可用金额不足");
}
- BigDecimal frozen = coinWallet.getFrozenBalance().subtract(otcEntrustOrder.getRemainCoinAmount());
- coinWallet.setAvailableBalance(coinWallet.getAvailableBalance().subtract(totalAmount));
- coinWallet.setFrozenBalance(frozen.add(totalAmount));
+ BigDecimal frozen = coinWallet.getFrozenBalance().subtract(remainAmount);
+ coinWallet.setAvailableBalance(coinWallet.getAvailableBalance().subtract(modifyDto.getAmount()));
+ coinWallet.setFrozenBalance(frozen.add(modifyDto.getAmount()));
memberWalletCoinDao.updateById(coinWallet);
}
--
Gitblit v1.9.1