From bb146de0f32bfbbb516e1c25ff4873986d548673 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 15 Jan 2026 10:41:21 +0800
Subject: [PATCH] etf
---
trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 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 71f0a2e..140fde9 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,13 +687,12 @@
// 锁仓截至时间
Date resultTime = calendar.getTime();
if (!isAdmin) {
+ if (isETF && (order.getUnLock() == null || order.getUnLock() == 0)) {
+ return Result.failed("未到平仓时间");
+ }
if (stockDz.getPeriod() != null && stockDz.getPeriod() > 0) {
- if ((order.getUnLock() == null || order.getUnLock() == 0) && now.getTime() < resultTime.getTime()) {
- return Result.failed("未到平仓时间");
- }
- } else {
- if (isETF && (order.getUnLock() == null || order.getUnLock() == 0)) {
+ if (now.getTime() < resultTime.getTime()) {
return Result.failed("未到平仓时间");
}
}
--
Gitblit v1.9.3