From 251d43605b8b6662aed276b10df7223b2df22d9d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 30 Nov 2020 15:15:43 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 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 c8804e9..810601c 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) {
@@ -387,11 +394,11 @@
                 //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("卖出受限");
+                    return Result.fail("");
                 }
 
                 if (StringUtils.isNotBlank(string) && StringUtils.isNotBlank(memberEntity.getEmail()) && string.contains(memberEntity.getEmail())) {
-                    return Result.fail("卖出受限");
+                    return Result.fail("");
                 }
             }
         }
@@ -802,7 +809,7 @@
 
     @Override
     public Result findAllWalletCoinOrder() {
-        List<OrderCoinsDealEntity> orderCoinsDealEntities = orderCoinDealDao.selectAllCoinDealsOrderBySymbol(CoinTypeEnum.ROC.toString());
+        List<OrderCoinsDealEntity> orderCoinsDealEntities = orderCoinDealDao.selectAllCoinDealsOrderBySymbol(CoinTypeEnum.SER.toString());
         return Result.ok(orderCoinsDealEntities);
     }
 
@@ -921,7 +928,7 @@
     @Transactional(rollbackFor = Exception.class)
     public void dealEntrustCoinOrder() {
         List<String> ignoreTypes = new ArrayList<>();
-        ignoreTypes.add(SymbolsConstats.ROC);
+        ignoreTypes.add(SymbolsConstats.SER);
         List<OrderCoinsEntity> list = orderCoinsDao.selectAllEntrustingCoinOrderList(ignoreTypes);
         if (CollUtil.isNotEmpty(list)) {
             for (OrderCoinsEntity orderCoinsEntity : list) {

--
Gitblit v1.9.1