From 0ca7bf5c850eaef852a6b49d4b94e8366deedb29 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Wed, 26 May 2021 15:03:51 +0800 Subject: [PATCH] 20210525 申诉 --- src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java | 11 ++++++++++- 1 files changed, 10 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 cecad17..da8e856 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,6 +40,8 @@ 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("已经是市商"); @@ -53,10 +55,17 @@ List<OtcOrder> unFinishOrders = otcOrderDao.selectOrderListForUser(member.getId(), 4); if (CollUtil.isNotEmpty(unFinishOrders)) { - BigDecimal.valueOf(finishOrders.size() - unFinishOrders.size()).divide(BigDecimal.valueOf(finishOrders.size()), 2, BigDecimal.ROUND_DOWN) + //完成率 = 已完成 / 总单数 + 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) { + throw new GlobalException("条件未达标"); + } } BigDecimal totalAmount = otcOrderDao.selectOrderTotalAmount(member.getId()); + if (setting.getTotalAmount().compareTo(totalAmount) > 0) { + throw new GlobalException("条件未达标"); + } OtcMarketBussiness mb = this.baseMapper.selectMarketBussinessByMemberId(member.getId()); OtcMarketBussiness otcMb = new OtcMarketBussiness(); -- Gitblit v1.9.1