From 6eef7f43f9ad3d82727fba36f543f268cfb646d2 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Tue, 09 Dec 2025 18:39:30 +0800
Subject: [PATCH] 大宗
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/dz/ApiETFDzController.java | 58 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 13 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/dz/ApiETFDzController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/dz/ApiETFDzController.java
index c2bdbd4..086265c 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/dz/ApiETFDzController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/dz/ApiETFDzController.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;
@@ -52,7 +53,7 @@
@ResponseBody
public Result buyDz(@RequestParam("dzId") String dzId,
@RequestParam(value = "password", required = false) String password,
- @RequestParam("num") double num) {
+ @RequestParam(name = "num", defaultValue = "1") double num) {
lock.lock();
try {
if (orderCreated.get()) {
@@ -63,7 +64,7 @@
if (partyId == null || partyId.isEmpty()) {
throw new YamiShopBindException("请先登录");
}
- return stockDzService.buyDz(dzId, password, num, partyId);
+ return stockDzService.buyDz(dzId, password, num, partyId, false);
} catch (Exception e) {
log.error(e.getMessage());
} finally{
@@ -76,23 +77,54 @@
- /**
- * 大宗交易订单列表
- * @param pageNum
- * @param pageSize
- * @param state
- * @return
- */
- @ApiOperation("大宗交易订单列表")
+
+ @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.indices);
+ return stockDzService.getDzOrderList(pageNum, pageSize, ExchangeApplyOrderDz.STATE_POSITION, partyId, Constants.indices);
}
+
+ @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.indices);
+ }
+
+ @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, false);
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ } finally{
+ lock.unlock();
+ orderCreated.set(false);
+ }
+ throw new YamiShopBindException("订单异常,请稍后重试");
+ }
+
}
--
Gitblit v1.9.3