From b0c050dc83ca2b02865a01998385f4deb1e0ab57 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Tue, 06 Jan 2026 17:45:11 +0800
Subject: [PATCH] ipo

---
 trading-order-admin/src/main/java/com/yami/trading/admin/controller/ipo/ApplyNewSharesOrderController.java |   32 +++++++++++++++++++++++++++++---
 1 files changed, 29 insertions(+), 3 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 bb40cc1..0328e40 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
@@ -15,10 +15,12 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.math.BigDecimal;
 import java.util.List;
 
 @RestController
@@ -125,13 +127,37 @@
             if (order.getStatus()!= 1){
                 throw  new BusinessException("申购订单已公布中签!");
             }
-            if (order.getStatus()==2){
-                order.setWinningNumber(order.getSubNumber());
-                order.setRequiredNumber(order.getSubNumber().multiply(order.getSubPrice()));
+            if (model.getStatus()==2){
+                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);
+                    order.setUserPromiseCount(1);
+                    //order.setSubscribedAmount(order.getRequiredNumber());
+                }
             }
             order.setStatus(model.getStatus());
         }
         applyNewSharesOrderService.updateBatchById(list);
         return  Result.succeed();
     }
+
+    @ApiOperation(value = "解锁")
+    @PostMapping("unLock")
+    public  Result unLock(String orderNo){
+        if (StringUtils.isEmpty(orderNo)){
+            throw new BusinessException("请选择申购订单记录");
+        }
+        System.out.println(orderNo);
+        ApplyNewSharesOrder order= applyNewSharesOrderService.findByOrderNo(orderNo);
+        if (order == null){
+            throw new BusinessException("未查到订单");
+        }
+        order.setUnLock(1);
+        applyNewSharesOrderService.updateById(order);
+        return  Result.succeed();
+    }
 }

--
Gitblit v1.9.3