From 58bfbdd031c7c21e0767bbe4cead8b676d9a2e26 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 07 Dec 2020 10:34:20 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java | 29 ++++++++++++++++++++---------
1 files changed, 20 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 b025574..295dfed 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,15 +350,22 @@
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)) {
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,8 +393,12 @@
// 判断redis开关
//String string = redisUtils.getString("SELL_LIMIT_KEY");
String string = redisUtils.getString("SELL_LIMIT_KEY_PHONE");
- if (StringUtils.isNotBlank(string) && string.contains(memberEntity.getPhone())) {
- return Result.fail("卖出受限");
+ 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("");
}
}
}
@@ -428,11 +439,11 @@
// 限价买不能高于当前10%
BigDecimal multiply = nowPrice.multiply(new BigDecimal("1.2"));
if (price.compareTo(multiply) > 0) {
- return Result.fail("不能高于当前价的120%");
+ return Result.fail("请输入合适的价格");
}
multiply= nowPrice.multiply(new BigDecimal("0.8"));
if (price.compareTo(multiply) < 0) {
- return Result.fail("不能低于当前价的80%");
+ return Result.fail("请输入合适的价格");
}
} else {
@@ -798,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);
}
@@ -917,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