From f5f4c3a813b283d6a3bfdfcfae4498b1b3bb60f9 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Wed, 07 Jan 2026 11:31:33 +0800
Subject: [PATCH] ipo

---
 trading-order-admin/src/main/java/com/yami/trading/admin/controller/ipo/ApplyNewSharesOrderController.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/ipo/ApplyNewSharesOrderController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/ipo/ApplyNewSharesOrderController.java
index 58ba408..78ca054 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/ipo/ApplyNewSharesOrderController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/ipo/ApplyNewSharesOrderController.java
@@ -20,6 +20,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.math.BigDecimal;
 import java.util.List;
 
 @RestController
@@ -127,8 +128,10 @@
                 throw  new BusinessException("申购订单已公布中签!");
             }
             if (model.getStatus()==2){
-                order.setWinningNumber(order.getSubNumber());
-                order.setRequiredNumber(order.getSubNumber().multiply(order.getSubPrice()));
+                if (order.getWinningNumber() == null || order.getWinningNumber().compareTo(BigDecimal.ZERO) == 0) {
+                    order.setWinningNumber(order.getSubNumber());
+                }
+                order.setRequiredNumber(order.getWinningNumber().multiply(order.getSubPrice()));
 
                 if (applyNewSharesOrderService.subscribe(order)) {
                     order.setSubscribedCount(1);
@@ -142,7 +145,7 @@
         return  Result.succeed();
     }
 
-    @ApiOperation(value = "解锁")
+    @ApiOperation(value = "解锁/锁定")
     @PostMapping("unLock")
     public  Result unLock(String orderNo){
         if (StringUtils.isEmpty(orderNo)){
@@ -153,7 +156,11 @@
         if (order == null){
             throw new BusinessException("未查到订单");
         }
-        order.setUnLock(1);
+        if (order.getUnLock() != null && order.getUnLock() == 1) {
+            order.setUnLock(0);
+        } else {
+            order.setUnLock(1);
+        }
         applyNewSharesOrderService.updateById(order);
         return  Result.succeed();
     }

--
Gitblit v1.9.3