From bd21cffed808eff59e330de7142c59af6b48e169 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 01 Oct 2024 19:17:52 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java |   27 ++++++++++++++++++++++++---
 1 files changed, 24 insertions(+), 3 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..bc4037e 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);
 
@@ -132,6 +148,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