From f6a912c1a6a26c809568f964941fb4ad4483274e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 31 May 2021 11:19:40 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 4fee959..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
@@ -130,10 +130,10 @@
@Override
public Result applyConditions() {
-// MemberEntity member = LoginUserUtils.getAppLoginUser();
-// member = memberDao.selectById(member.getId());
- long memberId = 444L;
- MemberEntity member = memberDao.selectById(memberId);
+ MemberEntity member = LoginUserUtils.getAppLoginUser();
+ member = memberDao.selectById(member.getId());
+// long memberId = 444L;
+// MemberEntity member = memberDao.selectById(memberId);
ApplyConditionsVo applyConditionsVo = new ApplyConditionsVo();
OtcSetting setting = otcSettingDao.selectById(1L);
@@ -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