From 474724c0e016be419fe84967fdcb085722e6b444 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期二, 22 九月 2026 11:20:12 +0800
Subject: [PATCH] bug：营收统计数据修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 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 a91cad3..06c6f1f 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
@@ -600,19 +600,16 @@
}
private Map<String, Object> getTicketIncome(String time, Integer operatorId, Integer storeId) {
- List<Integer> userIds;
+ List<Integer> storeIds;
if (storeId != null) {
- userIds = listStatisticsAppUserIdsForStore(storeId);
+ storeIds = Collections.singletonList(storeId);
} else if (operatorId != null) {
- userIds = listStatisticsAppUserIds(operatorId);
+ storeIds = listStatisticsStoreIds(operatorId, false);
} else {
- userIds = listStatisticsAppUserIds(null);
+ // 平台统计不限制 storeId，包含全国/城市通用门票等购买记录 storeId 为空的数据。
+ storeIds = Collections.emptyList();
}
- if (userIds == null) {
- userIds = new ArrayList<>();
- }
- // 活动服务对空集合会补充 -1，传入可变副本以兼容该历史实现。
- return pointMercharsClient.queryFee(new QueryDataFee(time, new ArrayList<>(userIds)));
+ return pointMercharsClient.queryTicketFee(new QueryDataFee(time, new ArrayList<>(storeIds)));
}
/** 惠民卡采用支付、退款两条事实流水，赠送卡不计营收。 */
--
Gitblit v1.7.1