From 78d39c4e43c80ea16cc96dc73d60c8880ac5020d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 30 Nov 2020 17:15:59 +0800
Subject: [PATCH] Merge branch 'outcenter' of https://gitee.com/chonggaoxiao/new_excoin.git into outcenter
---
src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 0e6d092..68a0cf3 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
@@ -350,9 +350,9 @@
Long memberId = LoginUserUtils.getAppLoginUser().getId();
// 需要实名
MemberEntity memberEntity = memberDao.selectById(memberId);
- if (!MemberEntity.CERTIFY_STATUS_Y.equals(memberEntity.getCertifyStatus())) {
- return Result.fail(MessageSourceUtils.getString("member_controller_0001"));
- }
+// if (!MemberEntity.CERTIFY_STATUS_Y.equals(memberEntity.getCertifyStatus())) {
+// return Result.fail(MessageSourceUtils.getString("member_controller_0001"));
+// }
// 需要先
String phone = memberEntity.getPhone();
if (!"13632989240".equals(phone) && !"15158130575".equals(phone)) {
@@ -360,11 +360,11 @@
// 禁止挂卖
String string = redisUtils.getString("BUY_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("");
}
// 不能超过800个
@@ -394,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("");
}
}
}
@@ -809,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);
}
@@ -928,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