From 37a07118ef1b4c2189b0098c49a8dd63a082b3df Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 10 Oct 2024 15:05:02 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java |   54 ++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 38 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 d520922..cc11dbf 100644
--- a/src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java
@@ -1,13 +1,16 @@
 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;
 import com.github.pagehelper.PageInfo;
 import com.nq.common.ServerResponse;
 import com.nq.dao.StockMapper;
+import com.nq.dao.UserStockSubscribeMapper;
 import com.nq.pojo.Stock;
 import com.nq.pojo.StockSubscribe;
+import com.nq.pojo.UserStockSubscribe;
 import com.nq.service.IStockSubscribeService;
 import com.nq.dao.StockSubscribeMapper;
 import lombok.extern.slf4j.Slf4j;
@@ -16,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;
 
@@ -32,6 +36,9 @@
     StockSubscribeMapper stockSubscribeMapper;
 
     @Autowired
+    UserStockSubscribeMapper userStockSubscribeMapper;
+
+    @Autowired
     StockMapper stockMapper;
 
     /**
@@ -42,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();
@@ -61,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);
 
@@ -83,16 +107,11 @@
     public ServerResponse add(StockSubscribe model, HttpServletRequest request) {
         //判断是否已经存在
         log.info("model:{}", model);
-        Stock stock = stockMapper.selectOne(new LambdaQueryWrapper<Stock>().eq(Stock::getStockSpell, model.getCode()).last(" limit 1"));
+        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())
-                .eq(StockSubscribe::getType, model.getType()));
-        if(count > 0){
-            return ServerResponse.createByErrorMsg("新股已存在");
-        }
+
         int resultCount = this.stockSubscribeMapper.insert(model);
         if (resultCount > 0) {
             return ServerResponse.createBySuccessMsg("添加新股成功");
@@ -113,14 +132,17 @@
         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::getNewStockId, stockSubscribe.getNewlistId()));
+        for (UserStockSubscribe u : userStockSubscribes) {
+            u.setNewCode(model.getCode());
+            userStockSubscribeMapper.updateById(u);
+        }
         if (resultCount > 0) {
             return ServerResponse.createBySuccessMsg("修改新股成功");
         }

--
Gitblit v1.9.3