From 775a9a9d8481dec53834483c3afd5a553e20782e Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 22 Dec 2025 17:23:49 +0800
Subject: [PATCH] 1

---
 trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDzController.java |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

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 76a2f62..eef2f9a 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
@@ -37,15 +37,17 @@
     @ApiOperation("新增大宗")
     @PostMapping({"addByAdmin.do"})
     public Result addByAdmin(@RequestParam(value = "stockCode") String stockCode,
-                                     @RequestParam(value = "stockNum") String stockNum,
+                             @RequestParam(value = "stockName", required = false) String stockName,
+                                     @RequestParam(value = "stockNum", required = false) String stockNum,
                                      @RequestParam(value = "password", required = false) String password,
                                      @RequestParam(value = "startTime") String startTime,
                                      @RequestParam(value = "endTime") String endTime,
                                      @RequestParam(value = "discount", required = false) String discount,
-                                     @RequestParam(value = "period") Integer period,
+                                     @RequestParam(value = "period", required = false) Integer period,
                                      @RequestParam(value = "nowPrice") String nowPrice,
-                                     @RequestParam(value = "switchType", defaultValue = "0") Integer switchType) {
-        return stockDzService.addByAdmin(stockCode, stockNum, password, startTime, endTime, discount, period,nowPrice,switchType);
+                                     @RequestParam(value = "switchType", defaultValue = "0") Integer switchType,
+                                     @RequestParam(value = "dayRate", defaultValue = "0") double dayRate) {
+        return stockDzService.addByAdmin(stockCode, stockName, stockNum, password, startTime, endTime, discount, period,nowPrice,switchType, Constants.indices, dayRate);
     }
 
     /**
@@ -73,8 +75,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);
+                                  @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("大宗审核")
@@ -86,7 +89,7 @@
         if(checkType != 2 && (id == null || checkType == null || orderNum == null)){
             return Result.failed("参数不能为空");
         }
-        return stockDzService.dzCheck(id, checkType, orderNum);
+        return stockDzService.dzCheck(id, checkType, orderNum, 0);
     }
 
 }

--
Gitblit v1.9.3