From 4affbdf8938d321c0926bc2b1832dfc81c317ffa Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 08 Jan 2026 18:49:30 +0800
Subject: [PATCH] ipo
---
trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java
index d211588..f37af6f 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java
@@ -687,11 +687,17 @@
// 锁仓截至时间
Date resultTime = calendar.getTime();
if (!isAdmin) {
+
if (stockDz.getPeriod() != null && stockDz.getPeriod() > 0) {
- if(now.getTime() < resultTime.getTime()){
+ if ((order.getUnLock() == null || order.getUnLock() == 0) && now.getTime() < resultTime.getTime()) {
+ return Result.failed("未到平仓时间");
+ }
+ } else {
+ if (order.getUnLock() == null || order.getUnLock() == 0) {
return Result.failed("未到平仓时间");
}
}
+
if (!stockDz.getStockName().contains("测试")) {
boolean isOpen = MarketOpenChecker.isMarketOpenByItemCloseType(Item.US_STOCKS);
if (!isOpen) {
--
Gitblit v1.9.3