From b24b627ff36baa382cdc9ba2f91febe44bcd063c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 14 Mar 2022 16:14:19 +0800
Subject: [PATCH] 20222223
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 456eb7e..2f00abc 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
@@ -50,13 +50,18 @@
OtcSetting setting = otcSettingDao.selectById(1L);
// 所有已完成订单
List<OtcOrder> finishOrders = otcOrderDao.selectOrderListForUser(member.getId(), 3);
- if (CollUtil.isEmpty(finishOrders) || setting.getOrderNum() > finishOrders.size()) {
+ if (setting.getOrderNum() > finishOrders.size()) {
+// if (CollUtil.isEmpty(finishOrders) || setting.getOrderNum() > finishOrders.size()) {
throw new GlobalException("条件未达标");
}
List<OtcOrder> allOrders = otcOrderDao.selectOrderListForUser(member.getId(), null);
if (CollUtil.isNotEmpty(allOrders)) {
- BigDecimal finishRatio = BigDecimal.valueOf(finishOrders.size()).divide(BigDecimal.valueOf(allOrders.size()), 4, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(100));
+ int i = 0;
+ if(CollUtil.isNotEmpty(finishOrders)){
+ i= finishOrders.size();
+ }
+ BigDecimal finishRatio = BigDecimal.valueOf(i).divide(BigDecimal.valueOf(allOrders.size()), 4, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(100));
if (setting.getCompletionRate().compareTo(finishRatio) > 0) {
throw new GlobalException("条件未达标");
}
--
Gitblit v1.9.1