From dca3e301410be4aee5a7895a1c2c1bbf90f3d03b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 16 Mar 2022 15:21:36 +0800
Subject: [PATCH] 20222223

---
 src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java |    4 +++-
 1 files changed, 3 insertions(+), 1 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..c973749 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() + mb.getSaleTotalCnt());
+        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());
@@ -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