From 1a88fe217417132fca0f6e381d2095b16ba51b26 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 14 Jan 2026 16:16:29 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/StockServiceImpl.java | 33 +++++++++++++--------------------
1 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/StockServiceImpl.java b/src/main/java/com/nq/service/impl/StockServiceImpl.java
index 6d01080..e0a9938 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -931,38 +931,31 @@
continue; // 股票不存在，跳过
}
- // 先获取真实涨跌幅数据
+ // 获取真实数据，用于获取前收盘价(pc)
StockRealTimeBean realTimeStock = RedisKeyUtil.getCacheRealTimeStock(stock);
- if (realTimeStock == null) {
+ if (realTimeStock == null || realTimeStock.getPc() == null) {
continue; // 无法获取真实数据，跳过
}
- // 获取当前价格(last)
- BigDecimal last = new BigDecimal(realTimeStock.getLast());
+ // 获取前收盘价(昨收)
+ BigDecimal prevClose = new BigDecimal(realTimeStock.getPc());
- // 计算盘前价格
+ // 计算盘前价格（根据StockSetting配置）
BigDecimal premarketPrice;
if ("0".equals(setting.getType())) {
// type=0: 直接指定价格
premarketPrice = new BigDecimal(setting.getPrice());
} else {
- // type=1: 百分比调价格，基于last计算
- premarketPrice = last.multiply(new BigDecimal(setting.getPrice()));
+ // type=1: 百分比调价格，基于昨收计算
+ premarketPrice = prevClose.multiply(new BigDecimal(setting.getPrice()));
}
- // 获取真实涨跌幅（相对于前收盘价的涨跌幅，getPcp()返回的是百分比数值，需要除以100转为小数）
- BigDecimal realHcrate = new BigDecimal(realTimeStock.getPcp())
- .divide(new BigDecimal("100"), 4, RoundingMode.HALF_UP);
-
- // 计算盘前价格相对于last的变化率 = (盘前价格 - last) / last
- BigDecimal premarketChangeRate = BigDecimal.ZERO;
- if (last.compareTo(BigDecimal.ZERO) > 0) {
- premarketChangeRate = premarketPrice.subtract(last)
- .divide(last, 4, RoundingMode.HALF_UP);
+ // 根据盘前价格和昨收计算涨跌幅 = (盘前价格 - 昨收) / 昨收
+ BigDecimal hcrate = BigDecimal.ZERO;
+ if (prevClose.compareTo(BigDecimal.ZERO) > 0) {
+ hcrate = premarketPrice.subtract(prevClose)
+ .divide(prevClose, 4, RoundingMode.HALF_UP);
}
-
- // 最终涨跌幅 = 真实涨跌幅 + 盘前价格相对于last的变化率
- BigDecimal hcrate = realHcrate.add(premarketChangeRate);
// 格式化涨跌幅为带百分号的字符串
String hcrateP = hcrate.multiply(new BigDecimal("100"))
@@ -970,7 +963,7 @@
PremarketStockVO vo = new PremarketStockVO();
vo.setCode(setting.getStockCode());
- vo.setPrice(last); // price对应last
+ vo.setPrice(premarketPrice); // price返回盘前价格
vo.setHcrate(hcrate);
vo.setHcrateP(hcrateP);
resultList.add(vo);
--
Gitblit v1.9.3