From 0f900ede938b2dda75a09451e12f37f9facefc08 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 12 Dec 2025 14:39:01 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDarkPoolsController.java | 6 ++++--
trading-order-service/src/main/java/com/yami/trading/service/dz/StockDzService.java | 2 +-
trading-order-service/src/main/java/com/yami/trading/dao/dz/StockDzMapper.java | 1 +
trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDzController.java | 5 +++--
trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDarkPoolsController.java | 6 ++++--
trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml | 6 ++++++
trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDzController.java | 6 ++++--
trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java | 5 +++--
8 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDarkPoolsController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDarkPoolsController.java
index 94296a4..d7f3c11 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDarkPoolsController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDarkPoolsController.java
@@ -78,8 +78,10 @@
public Result getDzCheckList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
@RequestParam(value = "pageSize", defaultValue = "15") int pageSize,
@RequestParam(value = "state", required = false) String state,
- @RequestParam(value = "stockCode", required = false)String stockCode) {
- return stockDzService.getDzCheckList(pageNum, pageSize, state, stockCode, Constants.indices_dark, null);
+ @RequestParam(value = "stockCode", required = false)String stockCode,
+ @RequestParam(value = "userName", required = false)String userName
+ ) {
+ return stockDzService.getDzCheckList(pageNum, pageSize, state, stockCode, Constants.indices_dark, userName, null);
}
@ApiOperation("大宗审核")
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDzController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDzController.java
index f88deaf..a26791a 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDzController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDzController.java
@@ -74,8 +74,9 @@
public Result getDzCheckList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
@RequestParam(value = "pageSize", defaultValue = "15") int pageSize,
@RequestParam(value = "state", required = false) String state,
- @RequestParam(value = "stockCode", required = false)String stockCode) {
- return stockDzService.getDzCheckList(pageNum, pageSize, state, stockCode, Constants.indices, null);
+ @RequestParam(value = "stockCode", required = false)String stockCode,
+ @RequestParam(value = "userName", required = false)String userName) {
+ return stockDzService.getDzCheckList(pageNum, pageSize, state, stockCode, Constants.indices, userName, null);
}
@ApiOperation("大宗审核")
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDarkPoolsController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDarkPoolsController.java
index 425e5d6..11e0a62 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDarkPoolsController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDarkPoolsController.java
@@ -97,8 +97,10 @@
public Result getDzCheckList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
@RequestParam(value = "pageSize", defaultValue = "15") int pageSize,
@RequestParam(value = "state", required = false) String state,
- @RequestParam(value = "stockCode", required = false)String stockCode) {
- return stockDzService.getDzCheckList(pageNum, pageSize, state, stockCode, Constants.US_DARK, permissionFacade.getOwnerUserIds());
+ @RequestParam(value = "stockCode", required = false)String stockCode,
+ @RequestParam(value = "userName", required = false)String userName
+ ) {
+ return stockDzService.getDzCheckList(pageNum, pageSize, state, stockCode, Constants.US_DARK, userName, permissionFacade.getOwnerUserIds());
}
@ApiOperation("大宗审核")
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDzController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDzController.java
index 203cccd..72928e3 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDzController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDzController.java
@@ -81,8 +81,10 @@
public Result getDzCheckList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
@RequestParam(value = "pageSize", defaultValue = "15") int pageSize,
@RequestParam(value = "state", required = false) String state,
- @RequestParam(value = "stockCode", required = false)String stockCode) {
- return stockDzService.getDzCheckList(pageNum, pageSize, state, stockCode, Constants.US_STOCKS, null);
+ @RequestParam(value = "stockCode", required = false)String stockCode,
+ @RequestParam(value = "userName", required = false)String userName
+ ) {
+ return stockDzService.getDzCheckList(pageNum, pageSize, state, stockCode, Constants.US_STOCKS, userName,null);
}
@ApiOperation("大宗审核")
diff --git a/trading-order-service/src/main/java/com/yami/trading/dao/dz/StockDzMapper.java b/trading-order-service/src/main/java/com/yami/trading/dao/dz/StockDzMapper.java
index cbdba26..4344649 100644
--- a/trading-order-service/src/main/java/com/yami/trading/dao/dz/StockDzMapper.java
+++ b/trading-order-service/src/main/java/com/yami/trading/dao/dz/StockDzMapper.java
@@ -32,6 +32,7 @@
@Param("state") String state,
@Param("stockCode") String stockCode,
@Param("stockType") String stockType,
+ @Param("userName") String userName,
@Param("checkedList") List<String> checkedList);
}
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/dz/StockDzService.java b/trading-order-service/src/main/java/com/yami/trading/service/dz/StockDzService.java
index db5f527..18df8f0 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/dz/StockDzService.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/dz/StockDzService.java
@@ -23,7 +23,7 @@
Result getDzOrderList(int pageNum, int pageSize, String state, String userId, String stockType);
- Result getDzCheckList(int pageNum, int pageSize, String state, String stockCode, String stockType, List<String> checkedList);
+ Result getDzCheckList(int pageNum, int pageSize, String state, String stockCode, String stockType,String userName, List<String> checkedList);
Result buyDz(String dzId, String password, double num, String partyId, Boolean isAdmin);
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java
index bfebf14..3a0cf8f 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java
@@ -246,11 +246,11 @@
}
@Override
- public Result getDzCheckList(int pageNum, int pageSize, String state, String stockCode, String stockType, List<String> checkedList) {
+ public Result getDzCheckList(int pageNum, int pageSize, String state, String stockCode, String stockType, String userName, List<String> checkedList) {
try {
Page page = new Page(pageNum, pageSize);
- stockDzMapper.getDzCheckList(page ,state, stockCode, stockType, checkedList);
+ stockDzMapper.getDzCheckList(page ,state, stockCode, stockType, userName, checkedList);
return Result.succeed(page);
} catch (Exception e) {
log.error(e.getMessage());
@@ -319,6 +319,7 @@
BigDecimal buyAmt;
if (isETF) {
buyAmt = new BigDecimal(num);
+ nowPrice = buyAmt;
} else {
buyAmt = nowPrice.multiply(new BigDecimal(num));
}
diff --git a/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml b/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml
index 7372f14..e8e2b19 100644
--- a/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml
+++ b/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml
@@ -87,6 +87,12 @@
<if test="stockType != null and stockType != '' ">
AND s.stock_type = #{stockType}
</if>
+ <if test="userName != null and userName != '' ">
+ AND (
+ u.user_name LIKE CONCAT('%', #{userName}, '%')
+ OR u.user_code LIKE CONCAT('%', #{userName}, '%')
+ )
+ </if>
<if test="checkedList!=null">
and u.user_id in
<foreach collection="checkedList" separator="," index="index" open="(" close=")" item="r">
--
Gitblit v1.9.3