From 97f6fdc09138a2346b61ccc4c716e87ab58e590f Mon Sep 17 00:00:00 2001
From: zyy3 <zyy3@zy.com>
Date: Tue, 06 Jan 2026 22:12:24 +0800
Subject: [PATCH] ipo

---
 trading-order-service/src/main/java/com/yami/trading/service/ipo/impl/UserPromiseRecordServiceImpl.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/trading-order-service/src/main/java/com/yami/trading/service/ipo/impl/UserPromiseRecordServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/ipo/impl/UserPromiseRecordServiceImpl.java
index 133e6af..871c2fa 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/ipo/impl/UserPromiseRecordServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/ipo/impl/UserPromiseRecordServiceImpl.java
@@ -97,10 +97,16 @@
          }
 
          if (newSharesConfig.getLockDay() > 0) {
-             Calendar calendar = Calendar.getInstance();
-             calendar.setTime(userPromiseRecords.get(0).getCreateTime());
-             calendar.add(Calendar.DAY_OF_YEAR,newSharesConfig.getLockDay());
-             if (System.currentTimeMillis() < calendar.getTimeInMillis()){
+             if (applyNewSharesOrder.getUnLock() == null || applyNewSharesOrder.getUnLock() == 0) {
+                 Calendar calendar = Calendar.getInstance();
+                 calendar.setTime(userPromiseRecords.get(0).getCreateTime());
+                 calendar.add(Calendar.DAY_OF_YEAR,newSharesConfig.getLockDay());
+                 if (System.currentTimeMillis() < calendar.getTimeInMillis()){
+                     throw new YamiShopBindException("新股锁定中无法卖出");
+                 }
+             }
+         } else { //未设置周期 未解锁不能卖出
+             if (applyNewSharesOrder.getUnLock() == null || applyNewSharesOrder.getUnLock() == 0) {
                  throw new YamiShopBindException("新股锁定中无法卖出");
              }
          }

--
Gitblit v1.9.3