From bc8766c652cbb02d5e07e3abce3400a53aaeeba2 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 21 Aug 2025 18:50:41 +0800
Subject: [PATCH] 平仓返回保证金修改
---
src/main/java/com/nq/service/impl/TradingHourServiceImpl.java | 14 +++++++++-----
1 files changed, 9 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 30b1cbb..7ca6608 100644
--- a/src/main/java/com/nq/service/impl/TradingHourServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/TradingHourServiceImpl.java
@@ -1,12 +1,13 @@
package com.nq.service.impl;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nq.dao.StockMapper;
import com.nq.dao.StockSettingMapper;
import com.nq.dao.StockTimeSettingMapper;
import com.nq.dao.TradingHourMapper;
-import com.nq.pojo.Stock;
import com.nq.pojo.StockSetting;
import com.nq.pojo.StockTimeSetting;
import com.nq.pojo.TradingHour;
@@ -16,6 +17,7 @@
import javax.annotation.Resource;
import java.time.LocalDate;
+import java.util.Date;
/**
* @program: dabao
@@ -43,13 +45,15 @@
* @return
*/
@Override
- public Boolean timeCheck(String stockCode) {
+ public Boolean timeCheck(String stockCode, String stockType) {
StockSetting stockSetting = stockSettingMapper.selectOne(new QueryWrapper<StockSetting>().eq("stock_code",stockCode));
- Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code",stockCode));
- StockTimeSetting stockTimeSetting = stockTimeSettingMapper.selectOne(new QueryWrapper<StockTimeSetting>().eq("accets_type",stock.getStockType()));
+ StockTimeSetting stockTimeSetting = stockTimeSettingMapper.selectOne(new QueryWrapper<StockTimeSetting>().eq("accets_type",stockType));
if(stockSetting!= null){
// 说明进入盘前交易或者盘后交易时间
- if(TimeUtil.isTradingHour(stockSetting.getStartTime(),stockSetting.getEndTime())){
+ Date newDate = new Date();
+ DateTime startTime = DateUtil.parseDateTime(stockSetting.getStartTime());
+ DateTime endTime = DateUtil.parseDateTime(stockSetting.getEndTime());
+ if(newDate.after(startTime) && newDate.before(endTime)){
return true;
}
}
--
Gitblit v1.9.3