From 99faf7be593f0595ce435084ee2b90a8d3da3bd4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 28 May 2021 15:58:31 +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/OtcMarketBussinessServiceImpl.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java
index c7cea0f..803d3d8 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java
@@ -160,6 +160,7 @@
}
BigDecimal totalAmount = otcOrderDao.selectOrderTotalAmount(member.getId());
+ totalAmount = totalAmount == null ? BigDecimal.ZERO : totalAmount;
if (setting.getTotalAmount().compareTo(totalAmount) > 0) {
applyConditionsVo.setTotalAmountStatus(2);
}else{
--
Gitblit v1.9.1