From c0b9a0978838536d21eeb4ab3ae5f29fa0d5dcc9 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 05 Jun 2024 15:36:46 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/TradingHourServiceImpl.java |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/TradingHourServiceImpl.java b/src/main/java/com/nq/service/impl/TradingHourServiceImpl.java
index 52ac833..6280ad3 100644
--- a/src/main/java/com/nq/service/impl/TradingHourServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/TradingHourServiceImpl.java
@@ -6,6 +6,7 @@
 import com.nq.dao.StockSettingMapper;
 import com.nq.dao.StockTimeSettingMapper;
 import com.nq.dao.TradingHourMapper;
+import com.nq.enums.EStockType;
 import com.nq.pojo.Stock;
 import com.nq.pojo.StockSetting;
 import com.nq.pojo.StockTimeSetting;
@@ -15,6 +16,10 @@
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.ZoneId;
 
 /**
  * @program: dabao
@@ -55,7 +60,28 @@
         if(stockTimeSetting == null){
             return  false;
         }
-        return TimeUtil.isTradingHour(stockTimeSetting.getAmStartTime(),stockTimeSetting.getAmEndTime(),stockTimeSetting.getPmStartTime(),stockTimeSetting.getPmEndTime());
+        if(!stockTimeSetting.getWeekDay().contains(String.valueOf(LocalDate.now().getDayOfWeek().getValue()))){
+            return false;
+        }
+
+        return TimeUtil.isTradingHour(stock.getStockType(),stockTimeSetting.getAmStartTime(),stockTimeSetting.getAmEndTime(),stockTimeSetting.getPmStartTime(),stockTimeSetting.getPmEndTime());
+    }
+
+    /**
+     * 判断股票代码是否在可交易时间段
+     * @return
+     */
+    @Override
+    public Boolean weekDayeCheck(String  stockCode) {
+
+        Stock stock =   stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code",stockCode));
+        StockTimeSetting stockTimeSetting = stockTimeSettingMapper.selectOne(new QueryWrapper<StockTimeSetting>().eq("accets_type",stock.getStockType()));
+        if(stockTimeSetting.getAccetsType().equals(EStockType.US.getCode())){
+            ZoneId usEastern = ZoneId.of("America/New_York");
+            LocalDate date = LocalDate.now(usEastern);
+            return stockTimeSetting.getWeekDay().indexOf(String.valueOf(date.getDayOfWeek().getValue())) >= 0;
+        }
+        return stockTimeSetting.getWeekDay().indexOf(String.valueOf(LocalDate.now().getDayOfWeek().getValue())) >= 0;
     }
 
     @Override

--
Gitblit v1.9.3