From 716f77637e6e324fd5865e82039c2c2ee3f94bfa Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 14 Jan 2026 15:53:06 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/StockServiceImpl.java |   30 ++++++++++++++++++++----------
 1 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/StockServiceImpl.java b/src/main/java/com/nq/service/impl/StockServiceImpl.java
index 9d597cf..5934291 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -931,7 +931,13 @@
                         continue; // 股票不存在,跳过
                     }
                     
-                    // 先获取真实价格(从Redis获取,不经过StockSetting计算)
+                    // 先获取真实涨跌幅数据
+                    StockRealTimeBean realTimeStock = RedisKeyUtil.getCacheRealTimeStock(stock);
+                    if (realTimeStock == null) {
+                        continue; // 无法获取真实数据,跳过
+                    }
+                    
+                    // 获取真实价格(从Redis获取,不经过StockSetting计算)
                     String s = RedisKeyUtil.doPost(stock.getStockCode(), stock.getStockType());
                     if (s == null) {
                         continue; // 无法获取真实价格,跳过
@@ -950,21 +956,25 @@
                         premarketPrice = realPrice.multiply(new BigDecimal(setting.getPrice()));
                     }
                     
-                    // 计算涨跌价格 = 盘前价格 - 真实价格
-                    BigDecimal chg = premarketPrice.subtract(realPrice);
+                    // 获取前收盘价
+                    BigDecimal prevClose = new BigDecimal(realTimeStock.getPc());
                     
-                    // 计算涨跌幅 = (盘前价格 - 真实价格) / 真实价格 * 100
-                    BigDecimal chgPct = BigDecimal.ZERO;
-                    if (realPrice.compareTo(BigDecimal.ZERO) > 0) {
-                        chgPct = chg.divide(realPrice, 4, RoundingMode.HALF_UP)
-                                .multiply(new BigDecimal("100"));
+                    // 基于盘前价格计算涨跌幅 = (盘前价格 - 前收盘价) / 前收盘价
+                    BigDecimal hcrate = BigDecimal.ZERO;
+                    if (prevClose.compareTo(BigDecimal.ZERO) > 0) {
+                        hcrate = premarketPrice.subtract(prevClose)
+                                .divide(prevClose, 4, RoundingMode.HALF_UP);
                     }
+                    
+                    // 格式化涨跌幅为带百分号的字符串
+                    String hcrateP = hcrate.multiply(new BigDecimal("100"))
+                            .setScale(2, RoundingMode.HALF_UP) + "%";
                     
                     PremarketStockVO vo = new PremarketStockVO();
                     vo.setCode(setting.getStockCode());
                     vo.setPrice(premarketPrice);
-                    vo.setChg(chg);
-                    vo.setChgPct(chgPct);
+                    vo.setHcrate(hcrate);
+                    vo.setHcrateP(hcrateP);
                     resultList.add(vo);
                 }
             }

--
Gitblit v1.9.3