From da335bddc242b2872029003332ef7549cceb0ce8 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 29 May 2024 19:55:01 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/TradingHourServiceImpl.java | 2 +-
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java | 13 +++++++++----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/TradingHourServiceImpl.java b/src/main/java/com/nq/service/impl/TradingHourServiceImpl.java
index 3198ac2..c4848bc 100644
--- a/src/main/java/com/nq/service/impl/TradingHourServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/TradingHourServiceImpl.java
@@ -60,7 +60,7 @@
if(stockTimeSetting == null){
return false;
}
- if(stockTimeSetting.getWeekDay().indexOf(String.valueOf(LocalDate.now().getDayOfWeek().getValue())) < 0){
+ if(!stockTimeSetting.getWeekDay().contains(String.valueOf(LocalDate.now().getDayOfWeek().getValue()))){
return false;
}
diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index 7a9f338..13137f1 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -326,10 +326,15 @@
return ServerResponse.createBySuccessMsg("股票不存在！", request);
}
//判断股票是否在可交易时间段
- Boolean b = isStockMarketOpen(stock.getStockType());
- Boolean wb = tradingHourService.weekDayeCheck(stock.getStockCode());
- if (!b || !wb) {
- return ServerResponse.createByErrorMsg("订单失败,不在交易时间之内", request);
+// Boolean b = isStockMarketOpen(stock.getStockType());
+// Boolean wb = tradingHourService.weekDayeCheck(stock.getStockCode());
+// if (!b || !wb) {
+// return ServerResponse.createByErrorMsg("订单失败,不在交易时间之内", request);
+// }
+
+ Boolean b = tradingHourService.timeCheck(userPosition.getStockCode());
+ if (!b) {
+ return ServerResponse.createByErrorMsg("订单失败,不在交易时间之内");
}
if (userPosition == null) {
--
Gitblit v1.9.3