From 98480d8822abf2289917c568876d4eeea1bbf504 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Wed, 26 May 2021 18:37:27 +0800 Subject: [PATCH] 20210526 聊天 --- src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java | 11 +++++------ 1 files changed, 5 insertions(+), 6 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 102810b..363eaff 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 @@ -48,16 +48,15 @@ } OtcSetting setting = otcSettingDao.selectById(1L); // 所有已完成订单 - List<OtcOrder> finishOrders = otcOrderDao.selectOrderListForUser(member.getId(), 0); + List<OtcOrder> finishOrders = otcOrderDao.selectOrderListForUser(member.getId(), 3); if (CollUtil.isEmpty(finishOrders) || setting.getOrderNum() > finishOrders.size()) { throw new GlobalException("条件未达标"); } - List<OtcOrder> unFinishOrders = otcOrderDao.selectOrderListForUser(member.getId(), 4); - if (CollUtil.isNotEmpty(unFinishOrders)) { - //完成率 = 已完成 / 总单数 - BigDecimal finishRatio = BigDecimal.valueOf(finishOrders.size()).divide(BigDecimal.valueOf(finishOrders.size() + unFinishOrders.size()), 4, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(100)); - if (setting.getCompletionRate().compareTo(finishRatio) >= 0) { + 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)); + if (setting.getCompletionRate().compareTo(finishRatio) > 0) { throw new GlobalException("条件未达标"); } } -- Gitblit v1.9.1