From 85037c73f8b16f4258a2af354cd162247700ffde Mon Sep 17 00:00:00 2001
From: peternameyakj <908253177@qq.com>
Date: Sun, 14 Jul 2024 18:35:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/6-29' into 6-29
---
src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java
index 16c1dd3..cc11dbf 100644
--- a/src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java
@@ -1,5 +1,6 @@
package com.nq.service.impl;
+import cn.hutool.core.convert.Convert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -18,6 +19,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import javax.xml.stream.events.EntityDeclaration;
import java.util.Date;
import java.util.List;
@@ -47,7 +49,7 @@
* @Date: 2022/10/25
*/
@Override
- public ServerResponse list(String name, String code, Integer zt,Integer getType, Integer isLock, Integer type, HttpServletRequest request) {
+ public ServerResponse list(String name, String code, Integer zt,Integer getType, Integer isLock, Integer type, Integer stockType,Integer postType,HttpServletRequest request) {
//name和code模糊查询
QueryWrapper<StockSubscribe> queryWrapper = new QueryWrapper();
@@ -66,11 +68,28 @@
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);
}
queryWrapper.orderByDesc("newlist_id");
+// if(postType == 0){
+// 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);
@@ -92,12 +111,7 @@
if(null == stock){
return ServerResponse.createByErrorMsg("新股代码不存在");
}
- Long count = stockSubscribeMapper.selectCount(new LambdaQueryWrapper<StockSubscribe>()
- .eq(StockSubscribe::getCode, model.getCode())
- .eq(StockSubscribe::getType, model.getType()));
- if(count > 0){
- return ServerResponse.createByErrorMsg("新股已存在");
- }
+
int resultCount = this.stockSubscribeMapper.insert(model);
if (resultCount > 0) {
return ServerResponse.createBySuccessMsg("添加新股成功");
@@ -118,18 +132,13 @@
if (stockSubscribe == null) {
return ServerResponse.createByErrorMsg("新股不存在");
}
- Long count = stockSubscribeMapper.selectCount(new LambdaQueryWrapper<StockSubscribe>()
- .eq(StockSubscribe::getCode, model.getCode())
- .eq(StockSubscribe::getType, model.getType()).ne(StockSubscribe::getNewlistId,model.getNewlistId()));
- if(count > 0){
- return ServerResponse.createByErrorMsg("新股已存在");
- }
+
//修改新股
int resultCount = this.stockSubscribeMapper.updateById(model);
//修改用户申购的新股代码
List<UserStockSubscribe> userStockSubscribes = userStockSubscribeMapper
.selectList(new LambdaQueryWrapper<UserStockSubscribe>()
- .eq(UserStockSubscribe::getNewCode, stockSubscribe.getCode()));
+ .eq(UserStockSubscribe::getNewStockId, stockSubscribe.getNewlistId()));
for (UserStockSubscribe u : userStockSubscribes) {
u.setNewCode(model.getCode());
userStockSubscribeMapper.updateById(u);
--
Gitblit v1.9.3