From decfc2ff7244cec365d3f32a5090edf5faeae861 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 23 Apr 2025 19:08:18 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java
index f0bb75e..0f9d52b 100644
--- a/src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java
@@ -7,9 +7,11 @@
import com.github.pagehelper.PageInfo;
import com.nq.common.ServerResponse;
import com.nq.dao.StockMapper;
+import com.nq.dao.UserPositionMapper;
import com.nq.dao.UserStockSubscribeMapper;
import com.nq.pojo.Stock;
import com.nq.pojo.StockSubscribe;
+import com.nq.pojo.UserPosition;
import com.nq.pojo.UserStockSubscribe;
import com.nq.service.IStockSubscribeService;
import com.nq.dao.StockSubscribeMapper;
@@ -41,6 +43,9 @@
@Autowired
StockMapper stockMapper;
+ @Autowired
+ UserPositionMapper userPositionMapper;
+
/**
* @Description: 用户新股列表
* @Param:
@@ -68,9 +73,9 @@
if (type != null && !type.equals("")) {
queryWrapper.eq("type", type);
}
- if(getType == 1){
- queryWrapper.gt("list_date", new Date());
- }
+// if(getType == 1){
+// queryWrapper.gt("list_date", new Date());
+// }
if(stockType != null){
queryWrapper.eq("stock_type", stockType);
}
@@ -79,6 +84,17 @@
// queryWrapper.select(StockSubscribe.class, info -> !info.getColumn().equals("password"));
// }
List<StockSubscribe> stockSubscribeList = this.stockSubscribeMapper.selectList(queryWrapper);
+
+ Date newDate = new Date();
+
+ for (StockSubscribe stockSubscribe : stockSubscribeList) {
+ Date startDate = stockSubscribe.getSubscribeTime();
+ Date endDate = stockSubscribe.getSubscriptionTime();
+
+ boolean isBetween = newDate.after(startDate) && newDate.before(endDate);
+ stockSubscribe.setIsBetween(isBetween);
+ }
+
PageInfo pageInfo = new PageInfo(stockSubscribeList);
pageInfo.setList(stockSubscribeList);
@@ -96,11 +112,15 @@
public ServerResponse add(StockSubscribe model, HttpServletRequest request) {
//判断是否已经存在
log.info("model:{}", model);
- Stock stock = stockMapper.selectOne(new LambdaQueryWrapper<Stock>().eq(Stock::getStockCode, model.getCode()).last(" limit 1"));
- if(null == stock){
- return ServerResponse.createByErrorMsg("新股代码不存在");
+// Stock stock = stockMapper.selectOne(new LambdaQueryWrapper<Stock>().eq(Stock::getStockCode, model.getCode()).last(" limit 1"));
+// if(null == stock){
+// return ServerResponse.createByErrorMsg("新股代码不存在");
+// }
+ Long count = stockSubscribeMapper.selectCount(new LambdaQueryWrapper<StockSubscribe>()
+ .eq(StockSubscribe::getCode, model.getCode()));
+ if(count > 0){
+ return ServerResponse.createByErrorMsg("新股代码已存在");
}
-
int resultCount = this.stockSubscribeMapper.insert(model);
if (resultCount > 0) {
return ServerResponse.createBySuccessMsg("添加新股成功");
@@ -121,6 +141,12 @@
if (stockSubscribe == null) {
return ServerResponse.createByErrorMsg("新股不存在");
}
+ Long count = stockSubscribeMapper.selectCount(new LambdaQueryWrapper<StockSubscribe>()
+ .eq(StockSubscribe::getCode, model.getCode())
+ .ne(StockSubscribe::getNewlistId,model.getNewlistId()));
+ if(count > 0){
+ return ServerResponse.createByErrorMsg("新股代码已存在");
+ }
//修改新股
int resultCount = this.stockSubscribeMapper.updateById(model);
@@ -132,6 +158,11 @@
u.setNewCode(model.getCode());
userStockSubscribeMapper.updateById(u);
}
+ List<UserPosition> userPositions = userPositionMapper.selectList(new LambdaQueryWrapper<UserPosition>().eq(UserPosition::getNewId, stockSubscribe.getNewlistId()));
+ for (UserPosition u : userPositions) {
+ u.setStockCode(model.getCode());
+ userPositionMapper.updateById(u);
+ }
if (resultCount > 0) {
return ServerResponse.createBySuccessMsg("修改新股成功");
}
--
Gitblit v1.9.3