From a14adcad31cbd3159f0055dbf1d234ca79f62071 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Tue, 15 Jul 2025 18:45:24 +0800
Subject: [PATCH] 基金修改
---
src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
index bde406e..3f4fe1e 100644
--- a/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java
@@ -17,11 +17,8 @@
import com.nq.utils.timeutil.DateTimeUtil;
import com.nq.utils.KeyUtils;
import com.nq.utils.PropertiesUtil;
-import com.nq.utils.redis.JsonUtil;
-import com.nq.utils.redis.RedisShardedPoolUtils;
-import com.nq.utils.stock.BuyAndSellUtils;
import com.nq.vo.stock.UserStockSubscribeAddIn;
-import com.sun.org.apache.bcel.internal.generic.RETURN;
+import com.nq.vo.subscribe.UserStockSubscribeVo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -99,7 +96,7 @@
if (siteProduct.getRealNameDisplay() && user.getIsActive() != 2) {
return ServerResponse.createByErrorMsg("订单失败，请先实名认证",request);
}
- UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(stockSubscribe.getStockType(), user.getId());
+ UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(stockSubscribe.getStockType(), user.getId());
if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
}
@@ -440,8 +437,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,20 +449,21 @@
/*新股申购-查询用户最新新股申购数据*/
@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("")){
+
+ List<UserStockSubscribeVo> userStockSubscribe = this.userStockSubscribeMapper.getListByParam(user.getId(), type, status);
+ /*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) {
+ List<UserStockSubscribeVo> list = new ArrayList<>();
+ for (UserStockSubscribeVo userStockSubscribe1 : userStockSubscribe) {
StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<>(new StockSubscribe())
.eq("newlist_id", userStockSubscribe1.getNewStockId()));
if (stockSubscribe != null) {
@@ -475,7 +472,7 @@
}
return ServerResponse.createBySuccess(list);
}
- return ServerResponse.createByErrorMsg("请先登录",request);
+ return ServerResponse.createByErrorCodeMsg(401,"请先登录");
}
/**
* 新股申购-用户提交金额
@@ -519,7 +516,7 @@
return ServerResponse.createByErrorMsg("新股认购订单不存在!",request);
}
}
- return ServerResponse.createByErrorMsg("请先登录",request);
+ return ServerResponse.createByErrorCodeMsg(401,"请先登录");
}
/**
* 新股申购-删除
@@ -539,9 +536,6 @@
}
return ServerResponse.createByErrorMsg("Operation failure");
}
-
-
-
}
\ No newline at end of file
--
Gitblit v1.9.3