From c75839006dcddeb1e2f5a04169d291c850dfaa13 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 12 Mar 2025 16:27:45 +0800
Subject: [PATCH] 1

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

diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index e351a04..acd9fbc 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -101,9 +101,9 @@
             if (siteProduct.getRealNameDisplay() && user.getIsActive() != 2) {
                 return ServerResponse.createByErrorMsg("订单失败,请先实名认证",request);
             }
-            if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
-                return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
-            }
+//            if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
+//                return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
+//            }
             Date currentDate = new Date();
             if(currentDate.before(stockSubscribe.getSubscriptionTime())){
                 return ServerResponse.createByErrorMsg("未开售",request);
@@ -397,9 +397,9 @@
 
     /*新股申购-查询列表*/
     @Override
-    public ServerResponse<PageInfo> getList(int pageNum, int pageSize, String keyword, String agentId,HttpServletRequest request){
+    public ServerResponse<PageInfo> getList(int pageNum, int pageSize, String keyword, String agentId,String name,Integer status,HttpServletRequest request){
         PageHelper.startPage(pageNum, pageSize);
-        List<UserStockSubscribe> listData = this.userStockSubscribeMapper.pageList(pageNum, pageSize, keyword,agentId);
+        List<UserStockSubscribe> listData = this.userStockSubscribeMapper.pageList(pageNum, pageSize, keyword,agentId,name,status);
         PageInfo pageInfo = new PageInfo(listData);
         pageInfo.setList(listData);
         return ServerResponse.createBySuccess(pageInfo);

--
Gitblit v1.9.3