From 28adb7ab6d9c09f7ca0160d884dde41b7b4a8ebd Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期一, 21 九月 2026 22:19:00 +0800
Subject: [PATCH] bug:地域统计bug

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
index 503fbf8..86c4c81 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
@@ -587,6 +587,13 @@
         // 门票饼图需要日/月/季/年卡拆分;此前该数据只在 type1 内部返回,
         // 现随统一营收接口返回,供平台页直接使用。
         monthlyData.put("ticketIncome", getTicketIncome(time, operatorId, storeId));
+        // 平台收入类型饼图还需要课程、订场分类明细。此前页面只能读取 type1
+        // 的模板数据,筛选后 getIncomeData 缺少该字段,导致课程图显示为空。
+        if (operatorId == null && storeId == null) {
+            Map<String, Object> platformTypeData = (Map<String, Object>) type1(time);
+            monthlyData.put("courseData", platformTypeData.get("courseData"));
+            monthlyData.put("siteData", platformTypeData.get("siteData"));
+        }
         return monthlyData;
     }
 
@@ -1889,7 +1896,8 @@
     @RequestMapping("/stuUserData")
     @ResponseBody
     public Object stuUserData() {
-        HashMap<String, Object> map = appUserClient.queryUserAgeYys(listStatisticsAppUserIds(null));
+        // 平台地域/年龄统计按平台注册用户全量口径,不能仅取已有消费记录的用户。
+        HashMap<String, Object> map = appUserClient.queryUserAge1();
 
         return map;
     }

--
Gitblit v1.7.1