From 4f0c87bbb84270e7b1dc3bd8dc1a4aa7ced128e7 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 03 Jun 2024 18:19:05 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java | 2 +-
src/main/java/com/nq/utils/timeutil/TimeUtil.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index 13137f1..9374bd6 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -334,7 +334,7 @@
Boolean b = tradingHourService.timeCheck(userPosition.getStockCode());
if (!b) {
- return ServerResponse.createByErrorMsg("订单失败,不在交易时间之内");
+ return ServerResponse.createByErrorMsg("订单失败,不在交易时间之内",request);
}
if (userPosition == null) {
diff --git a/src/main/java/com/nq/utils/timeutil/TimeUtil.java b/src/main/java/com/nq/utils/timeutil/TimeUtil.java
index b87dc8b..07218d4 100644
--- a/src/main/java/com/nq/utils/timeutil/TimeUtil.java
+++ b/src/main/java/com/nq/utils/timeutil/TimeUtil.java
@@ -16,7 +16,7 @@
}
- if(now.isAfter(pmTime) && now.isBefore(pmTime1)){
+ if(now.isAfter(pmTime) || now.isBefore(pmTime1)){
return true;
}
return false;
--
Gitblit v1.9.3