From e06766cea3474fa6d5f46d517ad1adbe471dd6d3 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 26 May 2021 14:34:35 +0800 Subject: [PATCH] modify --- src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java | 2 +- src/main/resources/mapper/otc/OtcOrderDao.xml | 9 +++------ src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java | 8 ++++---- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java b/src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java index 019481a..372d83a 100644 --- a/src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java +++ b/src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java @@ -36,7 +36,7 @@ private final MemberDao memberDao; - @ApiOperation(value = "applyMarketBussiness", notes = "申请市商接口") + @ApiOperation(value = "申请市商接口", notes = "申请市商接口") @PostMapping(value = "/applyMaketBussiness") public Result applyMarketBussiness() { otcMarketBussinessService.add(); 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..8aa1ade 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 @@ -46,14 +46,14 @@ } 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("条件未达标"); } diff --git a/src/main/resources/mapper/otc/OtcOrderDao.xml b/src/main/resources/mapper/otc/OtcOrderDao.xml index 7aafbd5..858e4a9 100644 --- a/src/main/resources/mapper/otc/OtcOrderDao.xml +++ b/src/main/resources/mapper/otc/OtcOrderDao.xml @@ -89,12 +89,9 @@ <select id="selectOrderListForUser" resultType="com.xcong.excoin.modules.otc.entity.OtcOrder"> select * from otc_order where member_id=#{memberId} - <!-- 查询除完成以外所有订单 --> - <if test="status != null and status == 0"> - and status != 3 - </if> - <if test="status != null and status != 0"> - and status != 3 + <!-- 查询除完成以外所有订单 --> + <if test="status != null"> + and status == #{status} </if> </select> -- Gitblit v1.9.1