From 7d9bf660d08d1b39af670e54dedf784e32080dc2 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 09 Jan 2026 17:54:01 +0800
Subject: [PATCH] ipo
---
trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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..08fc3b6 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
@@ -385,7 +385,7 @@
}
User party = userService.getById(partyId);
if (!party.isEnabled()) {
- throw new YamiShopBindException("用户已禁用");
+ return Result.failed("用户已禁用");
}
Syspara syspara = sysparaService.find("stop_user_internet");
String stopUserInternet = syspara.getSvalue();
@@ -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 (isETF && (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