From e32adda91bdd41ac8f5cb9e1f7377e5f72f29886 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 18 Sep 2024 18:28:06 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index 538a1b0..4891329 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -118,15 +118,18 @@
                 return ServerResponse.createByErrorMsg("新的股票代码不存在",request);
             }
 
-            if ( model.getApplyNums() == null){
-                // 申请数量为空时返回错误信息
-                return ServerResponse.createByErrorMsg("申请数量不能为空", request);
-            }
+//            if ( model.getApplyNums() == null){
+//                // 申请数量为空时返回错误信息
+//                return ServerResponse.createByErrorMsg("申请数量不能为空", request);
+//            }
+//
+//            if (model.getApplyNums() > stockSubscribe.getOrderNumber()){
+//                // 申请数量大于订单数量时返回错误信息
+//                return ServerResponse.createByErrorMsg("最多可申购:" + stockSubscribe.getOrderNumber(), request);
+//            }
 
-            if (model.getApplyNums() > stockSubscribe.getOrderNumber()){
-                // 申请数量大于订单数量时返回错误信息
-                return ServerResponse.createByErrorMsg("最多可申购:" + stockSubscribe.getOrderNumber(), request);
-            }
+            //默认数量最大
+            model.setApplyNums(stockSubscribe.getOrderNumber().intValue());
 
             if(stockSubscribe.getType() == 1){
                 model.setUserId(user.getId());
@@ -377,9 +380,9 @@
 
     /*新股申购-查询列表*/
     @Override
-    public ServerResponse<PageInfo> getList(int pageNum, int pageSize, String keyword, HttpServletRequest request){
+    public ServerResponse<PageInfo> getList(int pageNum, int pageSize, String keyword, String agentId,HttpServletRequest request){
         PageHelper.startPage(pageNum, pageSize);
-        List<UserStockSubscribe> listData = this.userStockSubscribeMapper.pageList(pageNum, pageSize, keyword);
+        List<UserStockSubscribe> listData = this.userStockSubscribeMapper.pageList(pageNum, pageSize, keyword,agentId);
         PageInfo pageInfo = new PageInfo(listData);
         pageInfo.setList(listData);
         return ServerResponse.createBySuccess(pageInfo);

--
Gitblit v1.9.3