From 4db1c06713cc8133d9858bee3c1cd1206588d61a Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 16 Mar 2022 10:36:44 +0800 Subject: [PATCH] Merge branch 'bea' of http://120.27.238.55:7000/r/exchange into bea --- src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java | 4 ++++ src/main/resources/mapper/otc/OtcOrderDao.xml | 2 +- src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java | 17 +++++++++++++---- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java index cda4dcf..5749d6d 100644 --- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java +++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java @@ -84,6 +84,8 @@ submitOrderDto.setSymbolCnt(submitEntrustDto.getSymbolCnt()); submitOrderDto.setLeverRatio(submitEntrustDto.getLeverRatio()); return contractHoldOrderService.submitOrder(submitOrderDto); + }else{ + return Result.fail(MessageSourceUtils.getString("entrust_price_judge_less")); } } @@ -96,6 +98,8 @@ submitOrderDto.setSymbolCnt(submitEntrustDto.getSymbolCnt()); submitOrderDto.setLeverRatio(submitEntrustDto.getLeverRatio()); return contractHoldOrderService.submitOrder(submitOrderDto); + }else{ + return Result.fail(MessageSourceUtils.getString("entrust_price_judge_more")); } } 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..1fc5cf9 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("条件未达标"); } @@ -148,7 +153,11 @@ applyConditionsVo.setCancellNum(setting.getCancellNum()); // 所有已完成订单 List<OtcOrder> finishOrders = otcOrderDao.selectOrderListForUser(member.getId(), 3); - if (CollUtil.isEmpty(finishOrders) || setting.getOrderNum() > finishOrders.size()) { + int i = 0; + if(CollUtil.isNotEmpty(finishOrders)){ + i = finishOrders.size(); + } + if (setting.getOrderNum() > i) { applyConditionsVo.setOrderNumStatus(2); }else{ applyConditionsVo.setOrderNumStatus(1); @@ -156,7 +165,7 @@ 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)); + BigDecimal finishRatio = BigDecimal.valueOf(i).divide(BigDecimal.valueOf(allOrders.size()), 4, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(100)); if (setting.getCompletionRate().compareTo(finishRatio) > 0) { applyConditionsVo.setCompletionRateStatus(2); }else{ diff --git a/src/main/resources/mapper/otc/OtcOrderDao.xml b/src/main/resources/mapper/otc/OtcOrderDao.xml index 4928e5b..a7d0212 100644 --- a/src/main/resources/mapper/otc/OtcOrderDao.xml +++ b/src/main/resources/mapper/otc/OtcOrderDao.xml @@ -99,7 +99,7 @@ </select> <select id="selectOrderTotalAmount" resultType="java.math.BigDecimal"> - select sum(total_amount) from otc_order + select IFNULL(sum(total_amount), 0) from otc_order where member_id=#{memberId} and status = 3 </select> -- Gitblit v1.9.1