From 1b5faa64dbb22935de1ff33a2bd01a41446f857b Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 02 Jun 2026 11:22:52 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/utils/stock/BuyAndSellUtils.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/nq/utils/stock/BuyAndSellUtils.java b/src/main/java/com/nq/utils/stock/BuyAndSellUtils.java
index aa5cf80..69455b0 100644
--- a/src/main/java/com/nq/utils/stock/BuyAndSellUtils.java
+++ b/src/main/java/com/nq/utils/stock/BuyAndSellUtils.java
@@ -59,6 +59,10 @@
}
+ public static boolean isInTransSession(String amBegin, String amEnd, String pmBegin, String pmEnd) throws Exception {
+ return isTransTime(amBegin, amEnd) || isTransTime(pmBegin, pmEnd);
+ }
+
public static boolean belongCalendar(Date nowTime, Date beginTime, Date endTime) {
@@ -75,16 +79,12 @@
end.setTime(endTime);
//開始時間小於結束時間，正常情況
- if (begin.before(end)){
- if (date.after(begin) && date.before(end)) {
- return true;
- }
+ if (begin.before(end) || begin.equals(end)){
+ return !date.before(begin) && !date.after(end);
}
- //開始時間大於結束時間，非正常情況
+ //開始時間大於結束時間，跨午夜
if (begin.after(end)){
- if (date.after(begin) || date.before(end)) {
- return true;
- }
+ return !date.before(begin) || !date.after(end);
}
--
Gitblit v1.9.3