From 0eb68e935e7a09fb2c20abb0276bdf4e4f554c5d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 26 May 2021 14:40:58 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java |   10 ++++++----
 1 files changed, 6 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 c0e9c06..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
@@ -40,20 +40,22 @@
     public void add() {
         MemberEntity member = LoginUserUtils.getAppLoginUser();
         member = memberDao.selectById(member.getId());
+//        long memberId = 444L;
+//        MemberEntity member = memberDao.selectById(memberId);
 
         if (MemberEntity.IS_TRADER_Y.equals(member.getIsTrader())) {
             throw new GlobalException("已经是市商");
         }
         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() - unFinishOrders.size()).divide(BigDecimal.valueOf(finishOrders.size()), 4, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(100));
+        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