From 83e8981accbc513b287184ca4094a50b5e5299ca Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 02 七月 2026 19:33:46 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 insertions(+), 2 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 714ce55..990dbda 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
@@ -53,6 +53,27 @@
@RequestMapping("/data")
public class DataStatisticsController extends BaseController {
private String PREFIX = "/system/dataStatistics/";
+
+ private Integer resolveOperatorId(Integer operatorId) {
+ Integer objectType = UserExt.getUser().getObjectType();
+ if (Integer.valueOf(2).equals(objectType)) {
+ return UserExt.getUser().getObjectId();
+ }
+ return operatorId;
+ }
+
+ private Integer resolveStoreId(Integer storeId) {
+ Integer objectType = UserExt.getUser().getObjectType();
+ if (!Integer.valueOf(2).equals(objectType) || storeId == null) {
+ return storeId;
+ }
+ TStore store = storeService.getById(storeId);
+ if (store != null && UserExt.getUser().getObjectId().equals(store.getOperatorId())) {
+ return storeId;
+ }
+ return null;
+ }
+
@Autowired
private ICityService cityService;
@Resource
@@ -115,6 +136,19 @@
@RequestMapping(value = "/getIncomeData")
@ResponseBody
public Object getIncomeData(Integer operatorId,Integer 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
@@ -141,7 +175,11 @@
}
}else {
List<Integer> list = new ArrayList<>();
+
+
list.add(storeId);
+
+
query.setStoresIds(list);
siteBookingQuery.setStoreIds(list);
competitionQuery.setStoreId(storeId);
@@ -235,7 +273,7 @@
}
// 积分商品
- List<PointMerchandiseIncomeVo> amount = pointMercharsClient.getAmount();
+ List<PointMerchandiseIncomeVo> amount = pointMercharsClient.getAmount(cityManagerId);
for (PointMerchandiseIncomeVo pointMerchandiseIncomeVo : amount) {
IncomeVO temp = new IncomeVO();
if (pointMerchandiseIncomeVo==null) continue;
@@ -653,6 +691,7 @@
@RequestMapping(value = "/backYys")
@ResponseBody
public Object backYys(Integer id) {
+ id = resolveOperatorId(id);
HashMap<String, Object> map = new HashMap<>();
List<Integer> userPt = appUserClient.getUserYYs(id);
if(userPt.size()==0){
@@ -886,6 +925,7 @@
@RequestMapping(value = "/stuYys")
@ResponseBody
public Object stuYys(Integer id) {
+ id = resolveOperatorId(id);
List<TStore> list4 = storeService.list(new QueryWrapper<TStore>().eq("operatorId", id).eq("state", 1));
List<Integer> collect1 = list4.stream().map(TStore::getId).collect(Collectors.toList());
//课程
@@ -933,6 +973,7 @@
@RequestMapping(value = "/courseYys")
@ResponseBody
public Object courseYys(Integer id) {
+ id = resolveOperatorId(id);
List<Integer> userPt = appUserClient.getUserYYs(id);
HashMap<String, Object> map = coursePackagePaymentClient.coursePt(userPt);
return map;
@@ -949,6 +990,7 @@
@RequestMapping(value = "/userAndVipYys")
@ResponseBody
public Object userAndVipYys(Integer id) {
+ id = resolveOperatorId(id);
List<TStore> list4 = storeService.list(new QueryWrapper<TStore>().eq("operatorId", id).eq("state", 1));
List<Integer> collect1 = list4.stream().map(TStore::getId).collect(Collectors.toList());
//课程
@@ -1013,6 +1055,7 @@
@RequestMapping(value = "/actYys")
@ResponseBody
public Object actYys(Integer id) {
+ id = resolveOperatorId(id);
CompetionVO competionVO = new CompetionVO();
List<TStore> list4 = storeService.list(new QueryWrapper<TStore>().eq("operatorId", id).eq("state", 1));
List<Integer> collect1 = list4.stream().map(TStore::getId).collect(Collectors.toList());
@@ -1028,8 +1071,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));
@@ -1117,6 +1161,7 @@
@ResponseBody
@RequestMapping("/selectYys")
public Object selectYys(Integer id,String time) {
+ id = resolveOperatorId(id);
HashMap<String, Object> map = new HashMap<>();
// 找出平台的用户
// List<User> list = sysUserService.list(new LambdaQueryWrapper<User>().eq(User::getObjectType, 2));
@@ -1495,6 +1540,7 @@
@RequestMapping("/stuUserDataYys")
@ResponseBody
public Object stuUserDataYys(Integer id) {
+ id = resolveOperatorId(id);
List<TStore> list4 = storeService.list(new QueryWrapper<TStore>().eq("operatorId", id).eq("state", 1));
List<Integer> collect1 = list4.stream().map(TStore::getId).collect(Collectors.toList());
//课程
@@ -1533,6 +1579,7 @@
@RequestMapping("/selectYysJx")
@ResponseBody
public Object selectYysJx(Integer id) {
+ id = resolveOperatorId(id);
List<TStore> list4 = storeService.list(new QueryWrapper<TStore>().eq("operatorId", id).eq("state", 1));
List<Integer> collect1 = list4.stream().map(TStore::getId).collect(Collectors.toList());
//课程
--
Gitblit v1.7.1