From 688bb5a8cfcca8540466b495ede193a1a7e5cd71 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Tue, 04 Nov 2025 13:58:44 +0800
Subject: [PATCH] 1

---
 trading-order-admin/src/main/java/com/yami/trading/api/controller/dz/ApiStockDzController.java |   67 ++++++++++++++++++++++++---------
 1 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/dz/ApiStockDzController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/dz/ApiStockDzController.java
index e5e5dbe..4b1aa97 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/dz/ApiStockDzController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/dz/ApiStockDzController.java
@@ -1,5 +1,6 @@
 package com.yami.trading.api.controller.dz;
 
+import com.yami.trading.bean.dz.ExchangeApplyOrderDz;
 import com.yami.trading.common.constants.Constants;
 import com.yami.trading.common.domain.Result;
 import com.yami.trading.common.exception.YamiShopBindException;
@@ -47,12 +48,12 @@
     }
 
 
-    /**
-     * 大宗下单
-     */
-    @RequestMapping({"buyStockDz.do"})
+    @ApiOperation("大宗下单")
+    @GetMapping({"buyStockDz.do"})
     @ResponseBody
-    public Result buyDz(@RequestParam("dzId") String dzId, @RequestParam("password") String password,@RequestParam("num") double num) {
+    public Result buyDz(@RequestParam("dzId") String dzId,
+                        @RequestParam(value = "password", required = false) String password,
+                        @RequestParam(name = "num", defaultValue = "1") double num) {
         lock.lock();
         try {
             if (orderCreated.get()) {
@@ -75,24 +76,54 @@
 
 
 
-
-    /**
-     * 大宗交易订单列表
-     * @param pageNum
-     * @param pageSize
-     * @param state
-     * @return
-    */
-    @ApiOperation("大宗交易订单列表")
-    @RequestMapping({"getDzOrderList.do"})
+    @ApiOperation("大宗交易持仓订单列表")
+    @PostMapping({"getDzOrderList.do"})
     @ResponseBody
     public Result getDzOrderList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
-                                         @RequestParam(value = "pageSize", defaultValue = "5") int pageSize,
-                                         @RequestParam(value = "state", required = false) String state) {
+                                         @RequestParam(value = "pageSize", defaultValue = "5") int pageSize) {
         String partyId = SecurityUtils.getCurrentUserId();
         if (partyId == null || partyId.isEmpty()) {
             throw new YamiShopBindException("请先登录");
         }
-        return stockDzService.getDzOrderList(pageNum, pageSize, state, partyId, Constants.US_STOCKS);
+        return stockDzService.getDzOrderList(pageNum, pageSize, ExchangeApplyOrderDz.STATE_POSITION, partyId, Constants.US_STOCKS);
     }
+
+    @ApiOperation("大宗交易历史订单列表")
+    @PostMapping({"getDzHistoryList.do"})
+    @ResponseBody
+    public Result getDzHistoryList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+                                 @RequestParam(value = "pageSize", defaultValue = "5") int pageSize) {
+        String partyId = SecurityUtils.getCurrentUserId();
+        if (partyId == null || partyId.isEmpty()) {
+            throw new YamiShopBindException("请先登录");
+        }
+        return stockDzService.getDzOrderList(pageNum, pageSize, null, partyId, Constants.US_STOCKS);
+    }
+
+
+    @ApiOperation("大宗平仓")
+    @GetMapping({"closeStockDz.do"})
+    @ResponseBody
+    public Result closeStockDz(@RequestParam("id") String id,
+                               @RequestParam(value = "num", required = false) Double num) {
+        lock.lock();
+        try {
+            if (orderCreated.get()) {
+                throw new YamiShopBindException("当前交易人数过多,请稍后重试");
+            }
+            orderCreated.set(true);
+            String partyId = SecurityUtils.getCurrentUserId();
+            if (partyId == null || partyId.isEmpty()) {
+                throw new YamiShopBindException("请先登录");
+            }
+            return stockDzService.closeDz(id, num, partyId);
+        } catch (Exception e) {
+            log.error(e.getMessage());
+        }  finally{
+            lock.unlock();
+            orderCreated.set(false);
+        }
+        throw new YamiShopBindException("订单异常,请稍后重试");
+    }
+
 }

--
Gitblit v1.9.3