From 6b9df2b72f776578c3b4f6217e9288d8989439d2 Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期四, 02 七月 2026 19:14:21 +0800
Subject: [PATCH] update
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 48 insertions(+), 12 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 523ef1a..bf2d67c 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
@@ -64,6 +64,9 @@
private Integer resolveStoreId(Integer storeId) {
Integer objectType = UserExt.getUser().getObjectType();
+ if (Integer.valueOf(3).equals(objectType)) {
+ return UserExt.getUser().getObjectId();
+ }
if (!Integer.valueOf(2).equals(objectType) || storeId == null) {
return storeId;
}
@@ -136,8 +139,19 @@
@RequestMapping(value = "/getIncomeData")
@ResponseBody
public Object getIncomeData(Integer operatorId,Integer storeId) {
- operatorId = resolveOperatorId(operatorId);
- storeId = resolveStoreId(storeId);
+// operatorId = resolveOperatorId(operatorId);
+// storeId = resolveStoreId(operatorId);
+ Integer objectId = UserExt.getUser().getObjectId();
+ List<Integer> cityManagerId= new ArrayList<>();
+ if(objectId>0){
+ operatorId=objectId;
+ if(storeId==null){
+ cityManagerId= storeService.list(new QueryWrapper<TStore>().eq("cityManagerId", objectId)).stream().map(TStore::getId).collect(Collectors.toList());
+ }else {
+ cityManagerId.add(storeId);
+ }
+
+ }
// 报名课程查询query
RegisterOrderQuery query = new RegisterOrderQuery();
// 充值记录查询query
@@ -164,7 +178,11 @@
}
}else {
List<Integer> list = new ArrayList<>();
+
+
list.add(storeId);
+
+
query.setStoresIds(list);
siteBookingQuery.setStoreIds(list);
competitionQuery.setStoreId(storeId);
@@ -258,7 +276,16 @@
}
// 积分商品
- List<PointMerchandiseIncomeVo> amount = pointMercharsClient.getAmount();
+ List<Integer> pointMerchandiseStoreIds = Collections.emptyList();
+ if (storeId != null) {
+ pointMerchandiseStoreIds = Collections.singletonList(storeId);
+ } else if (operatorId != null) {
+ pointMerchandiseStoreIds = storeIds;
+ if (pointMerchandiseStoreIds.size() == 0) {
+ pointMerchandiseStoreIds = Collections.singletonList(-1);
+ }
+ }
+ List<PointMerchandiseIncomeVo> amount = pointMercharsClient.getAmount(pointMerchandiseStoreIds);
for (PointMerchandiseIncomeVo pointMerchandiseIncomeVo : amount) {
IncomeVO temp = new IncomeVO();
if (pointMerchandiseIncomeVo==null) continue;
@@ -781,7 +808,8 @@
@RequestMapping(value = "/backStore")
@ResponseBody
public Object backStore(Integer id) {
- List<Integer> collect1 = Arrays.asList(id);
+ id = resolveStoreId(id);
+ List<Integer> collect1 = Arrays.asList(id == null ? -1 : id);
//课程
List<Integer> list = coursePackagePaymentClient.queryPaymentCoursePackage(collect1);
//场地
@@ -930,7 +958,8 @@
@RequestMapping(value = "/stuStores")
@ResponseBody
public Object stuStores(Integer id) {
- List<Integer> collect1 = Arrays.asList(id);
+ id = resolveStoreId(id);
+ List<Integer> collect1 = Arrays.asList(id == null ? -1 : id);
//课程
List<Integer> list = coursePackagePaymentClient.queryPaymentCoursePackage(collect1);
//场地
@@ -967,7 +996,8 @@
@RequestMapping(value = "/courseStore")
@ResponseBody
public Object courseStore(Integer id) {
- List<Integer> userPt = appUserClient.getUserPt(Arrays.asList(id));
+ id = resolveStoreId(id);
+ List<Integer> userPt = appUserClient.getUserPt(Arrays.asList(id == null ? -1 : id));
HashMap<String, Object> map = coursePackagePaymentClient.coursePt(userPt);
return map;
}
@@ -995,7 +1025,8 @@
@RequestMapping(value = "/userAndVipStore")
@ResponseBody
public Object userAndVipStore(Integer id) {
- List<Integer> collect1 = Arrays.asList(id);
+ id = resolveStoreId(id);
+ List<Integer> collect1 = Arrays.asList(id == null ? -1 : id);
//课程
List<Integer> list = coursePackagePaymentClient.queryPaymentCoursePackage(collect1);
//场地
@@ -1056,8 +1087,9 @@
//门票
- competionVO.setIds(list);
+ competionVO.setIds(list2);
competionVO.setOperatorId(id);
+ competionVO.setStoreIds(collect1);
HashMap<String, Object> map = competitionClient.actYys(competionVO);
List<TStore> lists = storeService.list(new LambdaQueryWrapper<TStore>().eq(TStore::getOperatorId, id));
@@ -1084,7 +1116,8 @@
@RequestMapping(value = "/actStore")
@ResponseBody
public Object actStore(Integer id) {
- List<Integer> collect1 = Arrays.asList(id);
+ id = resolveStoreId(id);
+ List<Integer> collect1 = Arrays.asList(id == null ? -1 : id);
//课程
List<Integer> list = coursePackagePaymentClient.queryPaymentCoursePackage(collect1);
//场地
@@ -1253,7 +1286,8 @@
@RequestMapping("/selectStore")
public Object selectStore(Integer id,String time) {
HashMap<String, Object> map = new HashMap<>();
- List<Integer> collect1 = Arrays.asList(id);
+ id = resolveStoreId(id);
+ List<Integer> collect1 = Arrays.asList(id == null ? -1 : id);
//课程
List<Integer> list = coursePackagePaymentClient.queryPaymentCoursePackage(collect1);
//场地
@@ -1544,7 +1578,8 @@
@ResponseBody
public Object stuUserDataStore(Integer id) {
- List<Integer> collect1 = Arrays.asList(id);
+ id = resolveStoreId(id);
+ List<Integer> collect1 = Arrays.asList(id == null ? -1 : id);
//课程
List<Integer> list = coursePackagePaymentClient.queryPaymentCoursePackage(collect1);
//场地
@@ -1597,7 +1632,8 @@
@RequestMapping("/selectStoreJx")
@ResponseBody
public Object selectStoreJx(Integer id) {
- List<Integer> collect1 = Arrays.asList(id);
+ id = resolveStoreId(id);
+ List<Integer> collect1 = Arrays.asList(id == null ? -1 : id);
//课程
List<Integer> list = coursePackagePaymentClient.queryPaymentCoursePackage(collect1);
//场地
--
Gitblit v1.7.1