From f395b0c222481fd4719045f7a7d47fa5d3e75b7b Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 11 Jun 2021 10:49:48 +0800 Subject: [PATCH] modify --- src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java b/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java index d5ce636..0e6d092 100644 --- a/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java +++ b/src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java @@ -357,6 +357,15 @@ String phone = memberEntity.getPhone(); if (!"13632989240".equals(phone) && !"15158130575".equals(phone)) { if (OrderCoinsEntity.ORDERTYPE_BUY.equals(type)) { + // 禁止挂卖 + String string = redisUtils.getString("BUY_LIMIT_KEY_PHONE"); + if (StringUtils.isNotBlank(string) && StringUtils.isNotBlank(phone) && string.contains(phone)) { + return Result.fail("买入受限"); + } + + if (StringUtils.isNotBlank(string) && StringUtils.isNotBlank(memberEntity.getEmail()) && string.contains(memberEntity.getEmail())) { + return Result.fail("买入受限"); + } // 不能超过800个 // if (amount != null && amount.compareTo(new BigDecimal("800")) > 0) { @@ -382,8 +391,13 @@ // } } else { // 判断redis开关 - String string = redisUtils.getString("SELL_LIMIT_KEY"); - if (StringUtils.isNotBlank(string)) { + //String string = redisUtils.getString("SELL_LIMIT_KEY"); + String string = redisUtils.getString("SELL_LIMIT_KEY_PHONE"); + if (StringUtils.isNotBlank(string) && StringUtils.isNotBlank(phone) && string.contains(phone)) { + return Result.fail("卖出受限"); + } + + if (StringUtils.isNotBlank(string) && StringUtils.isNotBlank(memberEntity.getEmail()) && string.contains(memberEntity.getEmail())) { return Result.fail("卖出受限"); } } @@ -658,6 +672,12 @@ OrderCoinsEntity coinsEntityCancel = trader.cancelOrder(orderCoinsEntity); if (coinsEntityCancel == null) { // 此时说明撮合系统已经没这个单了 不需要继续处理 + // 直接更新状态先 + OrderCoinsEntity update = new OrderCoinsEntity(); + update.setId(Long.valueOf(orderId)); + update.setOrderStatus(OrderCoinsEntity.ORDERSTATUS_CANCEL); + //orderCoinsEntity.setOrderStatus(OrderCoinsEntity.ORDERSTATUS_CANCEL); + orderCoinsDao.updateById(update); return null; } -- Gitblit v1.9.1