From 2ed572d6b2a4be6b91b3e2a1ed48485abde91553 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 15 Jul 2024 10:54:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zyqs-0502' into rb-copy
---
src/main/java/com/nq/utils/timeutil/TimeUtil.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nq/utils/timeutil/TimeUtil.java b/src/main/java/com/nq/utils/timeutil/TimeUtil.java
index 07218d4..a113319 100644
--- a/src/main/java/com/nq/utils/timeutil/TimeUtil.java
+++ b/src/main/java/com/nq/utils/timeutil/TimeUtil.java
@@ -4,7 +4,7 @@
public class TimeUtil {
- public static boolean isTradingHour(String amStartTime,String amEndTime,String pmStartTime,String pmEndTime){
+ public static boolean isTradingHour(String stockType,String amStartTime,String amEndTime,String pmStartTime,String pmEndTime){
LocalTime now = LocalTime.now();
LocalTime amTime = LocalTime.parse(amStartTime);
LocalTime amTime1 = LocalTime.parse(amEndTime);
@@ -15,10 +15,16 @@
return true;
}
-
- if(now.isAfter(pmTime) || now.isBefore(pmTime1)){
- return true;
+ if(stockType.equalsIgnoreCase("US")){
+ if(now.isAfter(pmTime) || now.isBefore(pmTime1)){
+ return true;
+ }
+ }else{
+ if(now.isAfter(pmTime) && now.isBefore(pmTime1)){
+ return true;
+ }
}
+
return false;
}
--
Gitblit v1.9.3