From 23c07b71a269f2540e5c09eb8d2002d9f20a857e Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 25 Apr 2024 16:07:43 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java
index 3f1e88b..bf3c632 100644
--- a/src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java
@@ -1,9 +1,12 @@
 package com.nq.service.impl;
 
+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.pojo.Stock;
 import com.nq.pojo.StockSubscribe;
 import com.nq.service.IStockSubscribeService;
 import com.nq.dao.StockSubscribeMapper;
@@ -11,7 +14,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -23,8 +28,11 @@
 @Slf4j
 public class StockSubscribeServiceImpl extends ServiceImpl<StockSubscribeMapper, StockSubscribe>
         implements IStockSubscribeService {
-    @Autowired
+    @Resource
     StockSubscribeMapper stockSubscribeMapper;
+
+    @Autowired
+    StockMapper stockMapper;
 
     /**
      * @Description: 用户新股列表
@@ -34,7 +42,7 @@
      * @Date: 2022/10/25
      */
     @Override
-    public ServerResponse list(String name, String code, Integer zt, Integer isLock, Integer type, HttpServletRequest request) {
+    public ServerResponse list(String name, String code, Integer zt,Integer getType, Integer isLock, Integer type, HttpServletRequest request) {
 
         //name和code模糊查询
         QueryWrapper<StockSubscribe> queryWrapper = new QueryWrapper();
@@ -52,6 +60,9 @@
         }
         if (type != null && !type.equals("")) {
             queryWrapper.eq("type", type);
+        }
+        if(getType == 1){
+            queryWrapper.gt("list_date", new Date());
         }
         queryWrapper.orderByDesc("newlist_id");
         List<StockSubscribe> stockSubscribeList = this.stockSubscribeMapper.selectList(queryWrapper);
@@ -72,15 +83,10 @@
     public ServerResponse add(StockSubscribe model, HttpServletRequest request) {
         //判断是否已经存在
         log.info("model:{}", model);
-        List<StockSubscribe> stockSubscribeList = this.stockSubscribeMapper.selectList(new QueryWrapper<StockSubscribe>().eq("code", model.getCode()));
-        if (stockSubscribeList != null && stockSubscribeList.size() > 0) {
-            return ServerResponse.createByErrorMsg("新股已经存在,不要重复添加");
+        Stock stock = stockMapper.selectOne(new LambdaQueryWrapper<Stock>().eq(Stock::getStockSpell, model.getCode()).last(" limit 1"));
+        if(null == stock){
+            return ServerResponse.createByErrorMsg("新股代码不存在");
         }
-//        String sinaStock = SinaStockApi.getInStockDetail(model.getCode());
-//        String[] arrayOfString = sinaStock.split(",");
-//        if (arrayOfString.length < 10)
-//        return ServerResponse.createByErrorMsg("数据源无该新股");
-        //添加新股
         int resultCount = this.stockSubscribeMapper.insert(model);
         if (resultCount > 0) {
             return ServerResponse.createBySuccessMsg("添加新股成功");

--
Gitblit v1.9.3