From f5d87a5a585adcbb148dee6c62ff6e18c4e7334c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 26 May 2021 14:36:40 +0800
Subject: [PATCH] conflect
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java
index 18c5555..695709c 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java
@@ -76,6 +76,7 @@
OtcSetting setting = otcSettingDao.selectById(1L);
String times = redisUtils.getString(AppContants.OTC_ORDER_CANCEL_TIMES + member.getId());
+ times = times == null ? "0" :times;
if (setting.getCancellNum() <= Integer.parseInt(times)) {
throw new GlobalException("订单取消次数过多, 限制交易24小时");
}
@@ -155,6 +156,7 @@
OtcSetting setting = otcSettingDao.selectById(1L);
String times = redisUtils.getString(AppContants.OTC_ORDER_CANCEL_TIMES + member.getId());
+ times = times == null ? "0" :times;
if (setting.getCancellNum() <= Integer.parseInt(times)) {
throw new GlobalException("订单取消次数过多, 限制交易24小时");
}
--
Gitblit v1.9.1