From ad1097015ebbd712f86761ee85e035c0b2bf5ab4 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 09 Feb 2026 16:33:45 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/utils/task/stock/CarryPositionTask.java |   83 +++++++++++++++++++++--------------------
 1 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/src/main/java/com/nq/utils/task/stock/CarryPositionTask.java b/src/main/java/com/nq/utils/task/stock/CarryPositionTask.java
index 24e0727..b117688 100644
--- a/src/main/java/com/nq/utils/task/stock/CarryPositionTask.java
+++ b/src/main/java/com/nq/utils/task/stock/CarryPositionTask.java
@@ -9,6 +9,7 @@
 import com.nq.dao.UserAssetsMapper;
 import com.nq.dao.UserMapper;
 import com.nq.dao.UserStockSubscribeMapper;
+import com.nq.enums.EStockType;
 import com.nq.pojo.StockSubscribe;
 import com.nq.pojo.User;
 import com.nq.pojo.UserAssets;
@@ -60,49 +61,49 @@
     private final AtomicBoolean ballot = new AtomicBoolean(false);
 
 
-    @Scheduled(cron = "0 0/1 * * * ?")
-    public void ballot() {
-        if (ballot.get()) { // 判断任务是否在处理中
-            return;
-        }
-        if (ballotLock.tryLock()) {
-            try {
-                ballot.set(true); // 设置处理中标识为true
-//                log.info("新股上市转持仓定时任务--------->开始");
-                log.info("新股上市定时任务--------->开始");
-                List<StockSubscribe> stockSubscribes = stockSubscribeMapper.selectList(new LambdaQueryWrapper<StockSubscribe>()
-                        .lt(StockSubscribe::getListDate, DateUtil.date()));
-                if (CollectionUtils.isNotEmpty(stockSubscribes)) {
-                    List<String> codeList = stockSubscribes.stream().map(StockSubscribe::getCode).collect(Collectors.toList());
-                    List<UserStockSubscribe> userStockSubscribes = userStockSubscribeMapper.selectList(new LambdaQueryWrapper<UserStockSubscribe>()
-                            .eq(UserStockSubscribe::getStatus, 3).in(UserStockSubscribe::getNewCode, codeList));
-                    //订单转持仓
-                    userStockSubscribes.forEach(f -> {
-                        ServerResponse serverResponse = iUserPositionService.newStockToPosition(f.getId(),BigDecimal.ZERO);//转持仓
-                        if(serverResponse.isSuccess()){
-                            f.setStatus(6);
-                            userStockSubscribeMapper.updateById(f);
-                        }else{
-                            log.info("新股上市定时任务失败申购订单id:"+f.getId()+",失败原因:"+serverResponse.getMsg());
-                        }
-                    });
-                }
-                log.info("新股上市定时任务--------->结束");
-            } catch (Exception e) {
-                log.error("新股上市定时任务发生异常", e);
-            } finally {
-                ballotLock.unlock();
-                ballot.set(false); // 设置处理中标识为false
-            }
-        } else {
-            log.info("新股上市定时任务--------->上次任务还未执行完成,本次任务忽略");
-        }
-    }
+//    @Scheduled(cron = "0 0/1 * * * ?")
+//    public void ballot() {
+//        if (ballot.get()) { // 判断任务是否在处理中
+//            return;
+//        }
+//        if (ballotLock.tryLock()) {
+//            try {
+//                ballot.set(true); // 设置处理中标识为true
+////                log.info("新股上市转持仓定时任务--------->开始");
+//                log.info("新股上市定时任务--------->开始");
+//                List<StockSubscribe> stockSubscribes = stockSubscribeMapper.selectList(new LambdaQueryWrapper<StockSubscribe>()
+//                        .lt(StockSubscribe::getListDate, DateUtil.date()));
+//                if (CollectionUtils.isNotEmpty(stockSubscribes)) {
+//                    List<String> codeList = stockSubscribes.stream().map(StockSubscribe::getCode).collect(Collectors.toList());
+//                    List<UserStockSubscribe> userStockSubscribes = userStockSubscribeMapper.selectList(new LambdaQueryWrapper<UserStockSubscribe>()
+//                            .eq(UserStockSubscribe::getStatus, 4).in(UserStockSubscribe::getNewCode, codeList));
+//                    //订单转持仓
+//                    userStockSubscribes.forEach(f -> {
+//                        ServerResponse serverResponse = iUserPositionService.newStockToPosition(f.getId(),BigDecimal.ZERO);//转持仓
+//                        if(serverResponse.isSuccess()){
+//                            f.setStatus(5);
+//                            userStockSubscribeMapper.updateById(f);
+//                        }else{
+//                            log.info("新股上市定时任务失败申购订单id:"+f.getId()+",失败原因:"+serverResponse.getMsg());
+//                        }
+//                    });
+//                }
+//                log.info("新股上市定时任务--------->结束");
+//            } catch (Exception e) {
+//                log.error("新股上市定时任务发生异常", e);
+//            } finally {
+//                ballotLock.unlock();
+//                ballot.set(false); // 设置处理中标识为false
+//            }
+//        } else {
+//            log.info("新股上市定时任务--------->上次任务还未执行完成,本次任务忽略");
+//        }
+//    }
 
     private final AtomicBoolean subscription = new AtomicBoolean(false);
 
-//    @Scheduled(cron = "0 0/1 * * * ?")
-    /*public void subscription() {
+    @Scheduled(cron = "0 0/1 * * * ?")
+    public void subscription() {
         if (subscription.get()) { // 判断任务是否在处理中
             return;
         }
@@ -129,6 +130,6 @@
         } else {
             log.info("自动转已认缴定时任务--------->上次任务还未执行完成,本次任务忽略");
         }
-    }*/
+    }
 
 }

--
Gitblit v1.9.3