From b08c3ca89f463f5a6775d77107d91cadce8bdf05 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 15 Sep 2025 18:09:40 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/StockDzServiceImpl.java |   36 ++++++++++++++++++++++--------------
 1 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/StockDzServiceImpl.java b/src/main/java/com/nq/service/impl/StockDzServiceImpl.java
index b807f0f..3b33f1a 100644
--- a/src/main/java/com/nq/service/impl/StockDzServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockDzServiceImpl.java
@@ -1,35 +1,30 @@
 package com.nq.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 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.PageHelper;
-import com.google.common.collect.Lists;
+import com.github.pagehelper.PageInfo;
 import com.nq.common.ServerResponse;
 import com.nq.dao.StockDzMapper;
 import com.nq.dao.StockMapper;
+import com.nq.dao.UserPositionMapper;
 import com.nq.pojo.Stock;
 import com.nq.pojo.StockDz;
-import com.nq.pojo.reponse.RPageInfo;
+import com.nq.pojo.UserPosition;
 import com.nq.service.StockDzService;
-import com.nq.utils.stock.sina.StockApi;
 import com.nq.utils.timeutil.DateTimeUtil;
-import com.nq.vo.stock.StockDzVo;
-import com.nq.vo.stock.StockListVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
 
 /**
 * @author Administrator
@@ -43,17 +38,20 @@
     @Autowired
     private StockDzMapper stockDzMapper;
     @Autowired
-    private SiteSettingServiceImpl siteSettingService;
-    @Autowired
     private StockMapper stockMapper;
+    @Autowired
+    private UserPositionMapper userPositionMapper;
 
     @Override
     public ServerResponse getDzList(int pageNum, int pageSize, String orderBy, String keyWords,  HttpServletRequest request) {
-        PageHelper.startPage(pageNum, pageSize);
         String formatDate = DateUtil.format(new Date(), DatePattern.NORM_DATETIME_PATTERN);
+        PageHelper.startPage(pageNum, pageSize);
+        /*if (keyWords == null || keyWords.trim().isEmpty()) {
+            // 如果 keyWords 为空,则直接返回空分页结果
+            return ServerResponse.createBySuccess(new RPageInfo());
+        }*/
         List<StockDz> stockTypeDz = stockMapper.findStockTypeDz(orderBy, keyWords,formatDate);
-        RPageInfo pageInfo = new RPageInfo();
-        pageInfo.setList(stockTypeDz);
+        PageInfo<StockDz> pageInfo = new PageInfo<>(stockTypeDz);
         return ServerResponse.createBySuccess(pageInfo);
     }
 
@@ -61,6 +59,12 @@
     public ServerResponse addByAdmin(String stockCode, String stockNum, String password, String startTime, String endTime, String discount,Integer period,String nowPrice,Integer switchType) {
         if (stockCode == null || stockCode.equals("")||stockNum == null || stockNum.equals("")|| startTime == null || startTime.equals("")||endTime == null || endTime.equals("") || period == null || nowPrice == null){
             return ServerResponse.createByErrorMsg("参数不能为空");
+        }
+
+        Long count = stockDzMapper.selectCount(new LambdaQueryWrapper<StockDz>()
+                .eq(StockDz::getStockCode,stockCode));
+        if(count > 0){
+            return ServerResponse.createByErrorMsg("股票代码已存在");
         }
 
         QueryWrapper queryWrapper = new QueryWrapper();
@@ -123,6 +127,10 @@
 
     @Override
     public ServerResponse deleteByAdmin(String id) {
+        List<UserPosition> userPositions = userPositionMapper.selectList(new LambdaQueryWrapper<>(UserPosition.class).eq(UserPosition::getDzId, id).isNull(UserPosition::getSellOrderId));
+        if(CollectionUtil.isNotEmpty(userPositions)){
+            return ServerResponse.createByErrorMsg("删除失败,当前大宗还有用户持有仓位");
+        }
         int res =  stockDzMapper.deleteById(id);
         if (res > 0) {
             return ServerResponse.createBySuccess("删除成功");

--
Gitblit v1.9.3