From 93e28828adf92cf848d2b12b91d7a086d73d7efc Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Mon, 12 Jan 2026 22:36:00 +0800
Subject: [PATCH] =?UTF-8?q?fix(statistics):=20=E4=BF=AE=E5=A4=8D=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=95=B0=E6=8D=AE=E5=90=88=E5=B9=B6=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将订单数据转为 Map 时使用 String.valueOf 处理 Object 类型数值
- 在合并数据时对时间键和金额字段进行字符串类型转换
- 防止因数值类型不匹配导致的数据丢失问题
---
 .../basic/service/pc/impl/StatisticsServiceImpl.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/StatisticsServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/StatisticsServiceImpl.java
index 8d64bc2f..b7775169 100644
--- a/src/main/java/com/ycwl/basic/service/pc/impl/StatisticsServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/pc/impl/StatisticsServiceImpl.java
@@ -111,21 +111,21 @@ public class StatisticsServiceImpl implements StatisticsService {
             List<HashMap<String, String>> statsData,
             List<HashMap<String, String>> orderData) {
 
-        // 将订单数据转为 Map 以便快速查找
+        // 将订单数据转为 Map 以便快速查找（使用 Object 类型处理数值）
         Map<String, HashMap<String, String>> orderMap = orderData.stream()
                 .collect(Collectors.toMap(
-                        m -> m.get("t"),
+                        m -> String.valueOf(m.get("t")),
                         m -> m,
                         (existing, replacement) -> existing
                 ));
 
         // 合并数据
         for (HashMap<String, String> stat : statsData) {
-            String timeKey = stat.get("t");
+            String timeKey = String.valueOf(stat.get("t"));
             HashMap<String, String> order = orderMap.get(timeKey);
             if (order != null) {
-                stat.put("orderCount", order.get("orderCount"));
-                stat.put("orderAmount", order.get("orderAmount"));
+                stat.put("orderCount", String.valueOf(order.get("orderCount")));
+                stat.put("orderAmount", String.valueOf(order.get("orderAmount")));
             } else {
                 stat.put("orderCount", "0");
                 stat.put("orderAmount", "0");