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/protol/UserController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nq/controller/protol/UserController.java b/src/main/java/com/nq/controller/protol/UserController.java
index 6c4315c..8710115 100644
--- a/src/main/java/com/nq/controller/protol/UserController.java
+++ b/src/main/java/com/nq/controller/protol/UserController.java
@@ -17,6 +17,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
+import com.nq.vo.stock.UserStockSubscribeAddIn;
import org.apache.ibatis.annotations.Property;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -122,6 +123,7 @@
buyOrderCreated.set(true);
return this.iUserPositionService.buy(stockId, buyNum, buyType, lever,profitTarget,stopLoss, request);
} catch (Exception e) {
+ e.printStackTrace();
return ServerResponse.createByErrorMsg("订单异常，请稍后重试", request);
} finally{
buyLock.unlock();
@@ -300,7 +302,7 @@
@RequestParam(value = "type", required = false) Integer type,
@RequestParam(value = "getType", required = false) Integer getType,
HttpServletRequest request) {
- return this.iStockSubscribeService.list(name,code,zt,getType,isLock,type,request);
+ return this.iStockSubscribeService.list(name,code,zt,getType,isLock,type,null,0,request);
}
/**
* 新股申购 添加
@@ -309,7 +311,7 @@
*/
@RequestMapping({"add.do"})
@ResponseBody
- public ServerResponse add(UserStockSubscribe model,HttpServletRequest request) throws Exception {
+ public ServerResponse add(UserStockSubscribeAddIn model, HttpServletRequest request) throws Exception {
return this.iUserStockSubscribeService.insert(model,request);
}
/*新股申购-用户新股申购数据*/
@@ -355,14 +357,14 @@
*/
@RequestMapping({"buyStockDz.do"})
@ResponseBody
- public ServerResponse buyDz(@RequestParam("stockCode") String stockCode, @RequestParam("password") String password,@RequestParam("num") Integer num, HttpServletRequest request) throws Exception {
+ public ServerResponse buyDz(@RequestParam("dzId") Integer dzId, @RequestParam("password") String password,@RequestParam("num") Integer num, HttpServletRequest request) throws Exception {
lock.lock();
try {
if (orderCreated.get()) {
return ServerResponse.createByErrorMsg("当前内幕交易人数过多，请稍后重试", request);
}
orderCreated.set(true);
- return this.iUserPositionService.buyDz(stockCode, password, num, request);
+ return this.iUserPositionService.buyDz(dzId, password, num, request);
} catch (Exception e) {
return ServerResponse.createByErrorMsg("订单异常，请稍后重试", request);
} finally{
--
Gitblit v1.9.3