From e9b82575bf16026c60bbf5ee4e42ca74358eb36c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 02 Jun 2021 11:27:46 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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..e0f6fee 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
@@ -109,7 +109,8 @@
}
MarketBussinessInfoVo mbVo = OtcMarketBussinessMapper.INSTANCE.entityToVo(mb);
-
+ mbVo.setTotalOrderCnt(mb.getTotalOrderCnt());
+ mbVo.setFinishRatio(mb.getFinishRatio().add(mb.getSaleFinishRatio()).divide(BigDecimal.valueOf(2), 4, BigDecimal.ROUND_DOWN));
MemberEntity member = memberDao.selectById(mb.getMemberId());
OtcEntrustOrder query = new OtcEntrustOrder();
query.setMemberId(mb.getMemberId());
@@ -130,10 +131,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 +161,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