From a516c9461d67482d669c1e64a001c06d7e28f218 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 05 Jan 2026 18:21:30 +0800
Subject: [PATCH] ipo

---
 trading-order-service/src/main/java/com/yami/trading/service/ipo/impl/UserPromiseRecordServiceImpl.java |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 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 16f306b..8fb8608 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
@@ -96,12 +96,17 @@
              throw new YamiShopBindException("未提交认缴记录");
          }
 
-        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("新股锁定中无法卖出");
-        }
+         if (newSharesConfig.getLockDay() > 0) {
+             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("新股锁定中无法卖出");
+                 }
+             }
+         }
+
          BigDecimal usdt=new BigDecimal("0");
          if (CollectionUtil.isNotEmpty(userPromiseRecords)){
              List<Realtime> realtimes = dataService.realtime(userPromiseRecords.get(0).getProductCode());

--
Gitblit v1.9.3