From 62d7a119eff0f11e4cf3f98249e1b8d978507944 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 24 Nov 2021 15:19:57 +0800
Subject: [PATCH] Merge branch 'fish' of http://120.27.238.55:7000/r/exchange into fish
---
src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 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 b025574..0762d7c 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
@@ -358,7 +358,14 @@
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) {
@@ -386,7 +393,11 @@
// 判断redis开关
//String string = redisUtils.getString("SELL_LIMIT_KEY");
String string = redisUtils.getString("SELL_LIMIT_KEY_PHONE");
- if (StringUtils.isNotBlank(string) && string.contains(memberEntity.getPhone())) {
+ 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("卖出受限");
}
}
@@ -798,7 +809,7 @@
@Override
public Result findAllWalletCoinOrder() {
- List<OrderCoinsDealEntity> orderCoinsDealEntities = orderCoinDealDao.selectAllCoinDealsOrderBySymbol(CoinTypeEnum.ROC.toString());
+ List<OrderCoinsDealEntity> orderCoinsDealEntities = orderCoinDealDao.selectAllCoinDealsOrderBySymbol(CoinTypeEnum.XCT.toString());
return Result.ok(orderCoinsDealEntities);
}
--
Gitblit v1.9.1