From b2116edaa629f2d678b2070d4265e2702b65f127 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期四, 17 九月 2026 17:10:39 +0800
Subject: [PATCH] feat&bug：文档相关数据优化内容
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 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 77ce727..f46d45d 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
@@ -1225,26 +1225,22 @@
@RequestMapping(value = "/actStore")
@ResponseBody
public Object actStore(Integer id) {
- List<Integer> collect1 = Arrays.asList(id);
- //课程
- List<Integer> list = coursePackagePaymentClient.queryPaymentCoursePackage(collect1);
- //场地
- List<SiteBooking> list1 = siteBookingService.list(new QueryWrapper<SiteBooking>().in("storeId", collect1).eq("state", 1));
- List<Integer> collect = list1.stream().map(SiteBooking::getAppUserId).collect(Collectors.toList());
- list.addAll(collect);
- //赛事
- List<Integer> list2 = competitionClient.queryAppUserId(collect1);
- list.addAll(list2);
- //门票
-
- HashMap<String, Object> map = competitionClient.actPt(list);
-
- List<TStore> lists = storeService.list(new LambdaQueryWrapper<TStore>().eq(TStore::getOperatorId, 0).ne(TStore::getState, 3));
- long l1=0;
- for (TStore tStore : lists) {
- l1 += getStoreOperatingHours(tStore, new Date());
+ if (Integer.valueOf(3).equals(UserExt.getUser().getObjectType())) {
+ id = UserExt.getUser().getObjectId();
+ } else {
+ id = resolveStoreId(id);
}
- map.put("allHour",l1);
+ TStore store = id == null ? null : storeService.getById(id);
+ CompetionVO competionVO = new CompetionVO();
+ if (store == null || !Integer.valueOf(1).equals(store.getState())) {
+ competionVO.setStoreIds(Collections.singletonList(-1));
+ } else {
+ List<Integer> storeIds = Collections.singletonList(store.getId());
+ competionVO.setStoreIds(storeIds);
+ }
+ HashMap<String, Object> map = competitionClient.actStore(competionVO);
+ map.put("allHour", store == null || !Integer.valueOf(1).equals(store.getState())
+ ? 0 : getStoreOperatingHours(store, new Date()));
return map;
}
--
Gitblit v1.7.1