From 85037c73f8b16f4258a2af354cd162247700ffde Mon Sep 17 00:00:00 2001
From: peternameyakj <908253177@qq.com>
Date: Sun, 14 Jul 2024 18:35:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/6-29' into 6-29
---
src/main/java/com/nq/controller/backend/AdminStockDz.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/nq/controller/backend/AdminStockDz.java b/src/main/java/com/nq/controller/backend/AdminStockDz.java
index 19eb0aa..e6fa901 100644
--- a/src/main/java/com/nq/controller/backend/AdminStockDz.java
+++ b/src/main/java/com/nq/controller/backend/AdminStockDz.java
@@ -8,6 +8,8 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import java.math.BigDecimal;
+
@RestController
@RequestMapping({"/admin/stockDz/"})
public class AdminStockDz {
@@ -15,7 +17,7 @@
StockDzService stockDzService;
/**
- * @Description: 获取大宗列表
+ * @Description: 获取大宗列表
* @Param:
* @return:
*/
@@ -23,20 +25,25 @@
public ServerResponse getDzListByAdmin(String keywords) {
return stockDzService.getDzListByAdmin(keywords);
}
+
/**
- * @Description: 新增大宗
+ * @Description: 新增大宗
* @Param:
* @return:
*/
@RequestMapping({"addByAdmin.do"})
- public ServerResponse addByAdmin(@RequestParam(value = "stockCode")String stockCode,
- @RequestParam(value = "stockNum")String stockNum,
- @RequestParam(value = "password")String password,
- @RequestParam(value = "startTime")String startTime,
- @RequestParam(value = "endTime")String endTime,
- @RequestParam(value = "discount") String discount) {
- return stockDzService.addByAdmin(stockCode,stockNum,password,startTime,endTime,discount);
+ public ServerResponse addByAdmin(@RequestParam(value = "stockCode") String stockCode,
+ @RequestParam(value = "stockNum") String stockNum,
+ @RequestParam(value = "password") 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 = "nowPrice") String nowPrice,
+ @RequestParam(value = "switchType", defaultValue = "0") Integer switchType) {
+ return stockDzService.addByAdmin(stockCode, stockNum, password, startTime, endTime, discount, period,nowPrice,switchType);
}
+
/**
* 删除大宗
*/
@@ -44,6 +51,7 @@
public ServerResponse deleteByAdmin(@RequestParam(value = "id") String id) {
return stockDzService.deleteByAdmin(id);
}
+
/**
* 修改大宗
*/
--
Gitblit v1.9.3