From 7f133cb8fc080b64ab8002b35f04b646f95a6abf Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 27 May 2021 16:37:38 +0800
Subject: [PATCH] Merge branch 'otc' of http://120.27.238.55:7000/r/exchange into otc
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 6d4d740..b0784f4 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
@@ -70,20 +70,21 @@
BigDecimal totalAmount = addDto.getUnitPrice().multiply(addDto.getAmount());
otcEntrustOrder.setTotalAmount(totalAmount);
- if (addDto.getMax().compareTo(totalAmount) < 0) {
+ if (totalAmount.compareTo(addDto.getMax()) < 0) {
throw new GlobalException("最大限额应小于总金额");
}
if (OtcEntrustOrder.ORDER_TYPE_S.equals(addDto.getType())) {
MemberWalletCoinEntity coinWallet = memberWalletCoinDao.selectWalletCoinBymIdAndCode(member.getId(), "USDT");
- if(coinWallet.getAvailableBalance().compareTo(totalAmount) < 0) {
+ BigDecimal multiply = addDto.getUnitPrice().multiply(coinWallet.getAvailableBalance());
+ if(multiply.compareTo(totalAmount) < 0) {
throw new GlobalException("可用金额不足");
}
memberWalletCoinDao.updateFrozenBalance(member.getId(), coinWallet.getId(), addDto.getAmount());
}
- if (MemberEntity.IS_TRADER_Y.equals(member.getIsTrader())) {
+ if (!MemberEntity.IS_TRADER_Y.equals(member.getIsTrader())) {
throw new GlobalException("不是市商");
}
--
Gitblit v1.9.1