From 7166584366406c107c3e46560580765f2db4cd5c Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 04 Jun 2026 10:21:17 +0800
Subject: [PATCH] 1
---
target/classes/com/nq/service/impl/UserServiceImpl.class | 0
src/main/java/com/nq/utils/task/stock/ForceSellTask.java | 39 ++++++-------
target/stock-0.0.1-SNAPSHOT.jar | 0
target/stock-0.0.1-SNAPSHOT.jar.original | 0
target/classes/com/nq/utils/task/stock/ForceSellTask.class | 0
src/main/java/com/nq/service/impl/UserServiceImpl.java | 99 ++++++++++++++++++++++-----------
6 files changed, 84 insertions(+), 54 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserServiceImpl.java b/src/main/java/com/nq/service/impl/UserServiceImpl.java
index 59bb0d5..59ee1a7 100644
--- a/src/main/java/com/nq/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserServiceImpl.java
@@ -978,50 +978,83 @@
BigDecimal enable_user_amt = user.getEnableAmt();
BigDecimal all_freez_amt = new BigDecimal("0");
for (UserPosition position : userPositions) {
-// PositionProfitVO positionProfitVO = iUserPositionService.getPositionProfitVO(position);
-// if (positionProfitVO == null) {
-// continue;
-// }
-
- StockListVO stockListVO = new StockListVO();
- stockListVO=SinaStockApi.assembleLideStockListVO(LiDeDataUtils.getStock(position.getStockCode()));
- if(org.springframework.util.ObjectUtils.isEmpty(stockListVO)){
- stockListVO = SinaStockApi.assembleStockListVO(SinaStockApi.getSinaStock(position.getStockGid()));
- }
- if (stockListVO == null) {
+ if (position.getStatus() != null && position.getStatus().intValue() == 0) {
continue;
}
- if(position.getProfitTargetPrice()!=null && position.getProfitTargetPrice().compareTo(new BigDecimal(stockListVO.getNowPrice())) <= 0 ||position.getStopTargetPrice() != null && position.getStopTargetPrice().compareTo(new BigDecimal(stockListVO.getNowPrice())) >= 0) {
+ StockListVO stockListVO = SinaStockApi.assembleLideStockListVO(LiDeDataUtils.getStock(position.getStockCode()));
+ if(org.springframework.util.ObjectUtils.isEmpty(stockListVO)){
+ stockListVO = SinaStockApi.assembleStockListVO(SinaStockApi.getSinaStock(position.getStockGid()));
+ }
+ if (stockListVO == null || stockListVO.getNowPrice() == null) {
+ continue;
+ }
+ BigDecimal nowPrice;
+ try {
+ nowPrice = new BigDecimal(stockListVO.getNowPrice());
+ } catch (Exception e) {
+ continue;
+ }
- try {
- this.iUserPositionService.sell(position.getPositionSn(), 0);
- SiteTaskLog siteTaskLog = new SiteTaskLog();
- siteTaskLog.setTaskType("单股止盈止损强平任务-股票持仓");
- String accountType = (user.getAccountType().intValue() == 0) ? "正式用户" : "模拟用户";
- String taskcnt = accountType + "-" + user.getRealName() + "被强平[达到目标盈亏] 用户id = " + user.getId() + ", 可用资金 = " + enable_user_amt + "冻结保证金 = " + all_freez_amt + ", 强平比例 = " + force_stop_percent + ",现价"+stockListVO.getNowPrice()+ ", 目标止盈价格:" + position.getProfitTargetPrice()+ ", 目标止损价格:" + position.getStopTargetPrice();
- siteTaskLog.setTaskCnt(taskcnt);
- String tasktarget = "此次强平订单号为：" + position.getPositionSn();
- siteTaskLog.setTaskTarget(tasktarget);
- siteTaskLog.setAddTime(new Date());
- siteTaskLog.setIsSuccess(Integer.valueOf(0));
- siteTaskLog.setErrorMsg("");
- int insertTaskCount = this.siteTaskLogMapper.insert(siteTaskLog);
- if (insertTaskCount > 0) {
- log.info("[盈利达到目标盈利]保存强制平仓task任务成功");
- } else {
- log.info("[盈利达到目标盈利]保存强制平仓task任务失败");
- }
- } catch (Exception e) {
- log.error("[盈利达到目标盈利]强制平仓失败...");
- }
+ if (!shouldForceSellByProfitStop(position, nowPrice)) {
+ continue;
+ }
+ try {
+ ServerResponse sellResult = this.iUserPositionService.sell(position.getPositionSn(), 0);
+ if (sellResult != null && !sellResult.isSuccess()) {
+ log.warn("[止盈止损强平] positionSn={} 失败: {}", position.getPositionSn(), sellResult.getMsg());
+ continue;
+ }
+ SiteTaskLog siteTaskLog = new SiteTaskLog();
+ siteTaskLog.setTaskType("单股止盈止损强平任务-股票持仓");
+ String accountType = (user.getAccountType().intValue() == 0) ? "正式用户" : "模拟用户";
+ String taskcnt = accountType + "-" + user.getRealName() + "被强平[达到目标盈亏] 用户id = " + user.getId() + ", 可用资金 = " + enable_user_amt + "冻结保证金 = " + all_freez_amt + ", 强平比例 = " + force_stop_percent + ",现价"+stockListVO.getNowPrice()+ ", 目标止盈价格:" + position.getProfitTargetPrice()+ ", 目标止损价格:" + position.getStopTargetPrice();
+ siteTaskLog.setTaskCnt(taskcnt);
+ String tasktarget = "此次强平订单号为：" + position.getPositionSn();
+ siteTaskLog.setTaskTarget(tasktarget);
+ siteTaskLog.setAddTime(new Date());
+ siteTaskLog.setIsSuccess(Integer.valueOf(0));
+ siteTaskLog.setErrorMsg("");
+ int insertTaskCount = this.siteTaskLogMapper.insert(siteTaskLog);
+ if (insertTaskCount > 0) {
+ log.info("[盈利达到目标盈利]保存强制平仓task任务成功");
+ } else {
+ log.info("[盈利达到目标盈利]保存强制平仓task任务失败");
+ }
+ } catch (Exception e) {
+ log.error("[盈利达到目标盈利]强制平仓失败 positionSn={}", position.getPositionSn(), e);
}
}
log.info("=========止盈止损定时任务============");
}
}
+
+ /** 买涨：现价>=止盈 或 现价<=止损；买跌：现价<=止盈 或 现价>=止损 */
+ private boolean shouldForceSellByProfitStop(UserPosition position, BigDecimal nowPrice) {
+ if (position == null || nowPrice == null || nowPrice.compareTo(BigDecimal.ZERO) <= 0) {
+ return false;
+ }
+ BigDecimal profitTarget = position.getProfitTargetPrice();
+ BigDecimal stopTarget = position.getStopTargetPrice();
+ boolean hasProfit = profitTarget != null && profitTarget.compareTo(BigDecimal.ZERO) > 0;
+ boolean hasStop = stopTarget != null && stopTarget.compareTo(BigDecimal.ZERO) > 0;
+ if (!hasProfit && !hasStop) {
+ return false;
+ }
+ boolean isLong = !"买跌".equals(position.getOrderDirection());
+ if (isLong) {
+ if (hasProfit && nowPrice.compareTo(profitTarget) >= 0) {
+ return true;
+ }
+ return hasStop && nowPrice.compareTo(stopTarget) <= 0;
+ }
+ if (hasProfit && nowPrice.compareTo(profitTarget) <= 0) {
+ return true;
+ }
+ return hasStop && nowPrice.compareTo(stopTarget) >= 0;
+ }
/*用户股票持仓单-强平提醒推送消息定时*/
public void ForceSellMessageTask() {
List<Integer> userIdList = this.iUserPositionService.findDistinctUserIdList();
diff --git a/src/main/java/com/nq/utils/task/stock/ForceSellTask.java b/src/main/java/com/nq/utils/task/stock/ForceSellTask.java
index 50c3776..483ccbd 100644
--- a/src/main/java/com/nq/utils/task/stock/ForceSellTask.java
+++ b/src/main/java/com/nq/utils/task/stock/ForceSellTask.java
@@ -15,7 +15,7 @@
import java.util.Date;
-//@Component
+@Component
public class ForceSellTask {
private static final Logger log = LoggerFactory.getLogger(ForceSellTask.class);
@@ -114,29 +114,26 @@
/**
* 用户持仓单-单支股票止损止盈线-强平定时
*/
-// @Scheduled(cron = "0 0/1 * ? * MON-FRI")
+ @Scheduled(cron = "0 0/1 9-15 ? * MON-FRI")
public void stockProfitLossOneTaskV2() {
-// boolean am = false;
-// boolean pm = false;
-// //todo 測試完成需要關閉註釋
-// try {
-// am = BuyAndSellUtils.isTransTime("9:30", "11:30");
-// pm = BuyAndSellUtils.isTransTime("13:00", "15:00");
-// } catch (Exception e) {
-// log.error("執行定時任務出錯，e = {}", e);
-// }
-//
-// log.info("當前 am = {} pm = {}", Boolean.valueOf(am), Boolean.valueOf(pm));
-// if (am || pm) {
- log.info("=====掃描單支股票盈虧執行，當前時間 {} =====", DateTimeUtil.dateToStr(new Date()));
- this.iUserService.ForceSellOneStockTaskV2();
- log.info("=====掃描單支股票盈虧結束，當前時間 {} =====", DateTimeUtil.dateToStr(new Date()));
-
-// } else {
-// log.info("當前時間不為周一至周五，或者不在交易時間內，不執行（強平）單支股票盈虧定時任務");
+ boolean am = false;
+ boolean pm = false;
+ try {
+ am = BuyAndSellUtils.isTransTime("9:30", "11:30");
+ pm = BuyAndSellUtils.isTransTime("13:00", "15:00");
+ } catch (Exception e) {
+ log.error("執行定時任務出錯，e = {}", e);
}
-
+ log.info("当前 am = {} pm = {}", am, pm);
+ if (am || pm) {
+ log.info("=====扫描单支股票止盈止损执行，当前时间 {} =====", DateTimeUtil.dateToStr(new Date()));
+ this.iUserService.ForceSellOneStockTaskV2();
+ log.info("=====扫描单支股票止盈止损结束，当前时间 {} =====", DateTimeUtil.dateToStr(new Date()));
+ } else {
+ log.info("当前不在交易时段内，不执行止盈止损定时任务");
+ }
+ }
/**
* 用户指数持仓单-指数止损止盈线-强平定时
*/
diff --git a/target/classes/com/nq/service/impl/UserServiceImpl.class b/target/classes/com/nq/service/impl/UserServiceImpl.class
index 14cb207..541e660 100644
--- a/target/classes/com/nq/service/impl/UserServiceImpl.class
+++ b/target/classes/com/nq/service/impl/UserServiceImpl.class
Binary files differ
diff --git a/target/classes/com/nq/utils/task/stock/ForceSellTask.class b/target/classes/com/nq/utils/task/stock/ForceSellTask.class
index e16c11a..56da5ab 100644
--- a/target/classes/com/nq/utils/task/stock/ForceSellTask.class
+++ b/target/classes/com/nq/utils/task/stock/ForceSellTask.class
Binary files differ
diff --git a/target/stock-0.0.1-SNAPSHOT.jar b/target/stock-0.0.1-SNAPSHOT.jar
index d952b14..60a88ec 100644
--- a/target/stock-0.0.1-SNAPSHOT.jar
+++ b/target/stock-0.0.1-SNAPSHOT.jar
Binary files differ
diff --git a/target/stock-0.0.1-SNAPSHOT.jar.original b/target/stock-0.0.1-SNAPSHOT.jar.original
index 2643316..1b6f250 100644
--- a/target/stock-0.0.1-SNAPSHOT.jar.original
+++ b/target/stock-0.0.1-SNAPSHOT.jar.original
Binary files differ
--
Gitblit v1.9.3