From bc68f4393cafe39c4fce614c8128936067ea25f7 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期二, 22 九月 2026 17:18:17 +0800
Subject: [PATCH] bug：登录问题和操作日志
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 46 insertions(+), 14 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 2fd0be0..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
@@ -316,10 +316,12 @@
Integer statisticsScopeObjectId = statisticsScopeType == 3 ? storeId
: (statisticsScopeType == 2 ? operatorId : null);
- List<Integer> cityManagerId= new ArrayList<>();
+ // 积分商品收入接口按门店 ID 过滤；空集合会被其 SQL 视为“不过滤”，
+ // 因此运营商统计必须传入该运营商名下的全部门店，不能传空集合。
+ List<Integer> cityManagerId = new ArrayList<>();
if (Integer.valueOf(2).equals(statisticsScopeType) && statisticsScopeObjectId != null) {
cityManagerId = storeService.list(new QueryWrapper<TStore>()
- .eq("cityManagerId", statisticsScopeObjectId).ne("state", 3))
+ .eq("operatorId", statisticsScopeObjectId).ne("state", 3))
.stream().map(TStore::getId).collect(Collectors.toList());
} else if (Integer.valueOf(3).equals(statisticsScopeType) && statisticsScopeObjectId != null) {
cityManagerId.add(statisticsScopeObjectId);
@@ -598,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)));
}
/** 惠民卡采用支付、退款两条事实流水，赠送卡不计营收。 */
@@ -1557,9 +1556,29 @@
objects.add(1);
objects.add(2);
vipPaymentLambdaQueryWrapper.in(SiteBooking::getPayType,objects);
- List<SiteBooking> list1 = siteBookingService.list(vipPaymentLambdaQueryWrapper);
+ List<SiteBooking> list1 = new ArrayList<>(siteBookingService.list(vipPaymentLambdaQueryWrapper));
double sum = list1.stream().mapToDouble(SiteBooking::getPayMoney).sum();
- map.put("fee5",sum);
+
+ // 智慧球场支付记录的场地可能只保存在 t_game.siteId。ballClient 已补齐该值，
+ // 将其转换为订场明细后可与普通订场一起按场地类型统计。
+ GameDataQuery gameDataQuery = new GameDataQuery();
+ gameDataQuery.setObjectId(id);
+ if (ToolUtil.isNotEmpty(time)) {
+ gameDataQuery.setStartTime(time.split(" - ")[0] + " 00:00:00");
+ gameDataQuery.setEndTime(time.split(" - ")[1] + " 23:59:59");
+ }
+ double gameIncome = 0D;
+ for (TGameRecord gameRecord : ballClient.getData(gameDataQuery)) {
+ if (gameRecord.getSiteId() == null || gameRecord.getMoney() == null || !ids.contains(gameRecord.getSiteId())) {
+ continue;
+ }
+ SiteBooking gameBooking = new SiteBooking();
+ gameBooking.setSiteId(gameRecord.getSiteId());
+ gameBooking.setPayMoney(gameRecord.getMoney().doubleValue());
+ list1.add(gameBooking);
+ gameIncome += gameRecord.getMoney().doubleValue();
+ }
+ map.put("fee5", sum + gameIncome);
List<Integer> collect = list1.stream().map(SiteBooking::getSiteId).collect(Collectors.toList());
@@ -1820,8 +1839,20 @@
}
// 平台智慧球场
List<TGameRecord> data1 = ballClient.getData(gameDataQuery);
+ // 将游戏支付转换为场地收入明细参与后续 siteId -> siteTypeId 分类。
+ // fee5 仍由普通订场金额与游戏金额分别相加，避免重复计入总额。
+ for (TGameRecord gameRecord : data1) {
+ if (gameRecord.getSiteId() == null || gameRecord.getMoney() == null) {
+ continue;
+ }
+ SiteBooking gameBooking = new SiteBooking();
+ gameBooking.setSiteId(gameRecord.getSiteId());
+ gameBooking.setPayMoney(gameRecord.getMoney().doubleValue());
+ list1.add(gameBooking);
+ }
double sum1 = data1.stream()
.map(TGameRecord::getMoney) // 获取每个 TGameRecord 对象的 money 字段
+ .filter(Objects::nonNull)
.mapToDouble(BigDecimal::doubleValue) // 将 BigDecimal 转换为 double
.sum();
map.put("fee5",sum+sum1);
@@ -1896,7 +1927,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