From c114364ebfef1cbfa5234dd76c7d70cda5662f68 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Tue, 15 Jul 2025 16:17:18 +0800
Subject: [PATCH] 新股修改
---
src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index 535c81f..9f544fc 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -440,8 +440,7 @@
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,agentId);
- PageInfo pageInfo = new PageInfo(listData);
- pageInfo.setList(listData);
+ PageInfo<UserStockSubscribe> pageInfo = new PageInfo<>(listData);
return ServerResponse.createBySuccess(pageInfo);
}
@@ -453,17 +452,30 @@
/*新股申购-查询用户最新新股申购数据*/
@Override
- public ServerResponse getOneSubscribeByUserId(String type,HttpServletRequest request) {
+ public ServerResponse getOneSubscribeByUserId(String type, Integer status, HttpServletRequest request) {
String property = PropertiesUtil.getProperty("user.cookie.name");
String header = request.getHeader(property);
if (header != null) {
User user = iUserService.getCurrentRefreshUser(request);
List<UserStockSubscribe> userStockSubscribe = null;
- if (type==null||type.equals("")){
+
+
+ QueryWrapper<UserStockSubscribe> queryWrapper = new QueryWrapper();
+ queryWrapper.eq("user_id", user.getId());
+
+ if (type != null && !type.isEmpty()){
+ queryWrapper.eq("type", type);
+ }
+ if (status != null){
+ queryWrapper.eq("status", status);
+ }
+ queryWrapper.orderByDesc("add_time");
+ userStockSubscribe = this.userStockSubscribeMapper.selectList(queryWrapper);
+ /*if (type==null||type.equals("")){
userStockSubscribe = this.userStockSubscribeMapper.selectList(new QueryWrapper<>(new UserStockSubscribe()).eq("user_id", user.getId()).orderByDesc("add_time"));
}else{
userStockSubscribe = this.userStockSubscribeMapper.selectList(new QueryWrapper<>(new UserStockSubscribe()).eq("user_id", user.getId()).eq("type", type).orderByDesc("add_time"));
- }
+ }*/
List<UserStockSubscribe> list = new ArrayList<>();
for (UserStockSubscribe userStockSubscribe1 : userStockSubscribe) {
@@ -539,9 +551,6 @@
}
return ServerResponse.createByErrorMsg("Operation failure");
}
-
-
-
}
\ No newline at end of file
--
Gitblit v1.9.3