From c05a63acc60e4978ae47be779824ec0055069381 Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期四, 02 七月 2026 17:54:43 +0800
Subject: [PATCH] update

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 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..523ef1a 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,8 @@
     @RequestMapping(value = "/getIncomeData")
     @ResponseBody
     public Object getIncomeData(Integer operatorId,Integer storeId) {
+        operatorId = resolveOperatorId(operatorId);
+        storeId = resolveStoreId(storeId);
         // 报名课程查询query
         RegisterOrderQuery query = new RegisterOrderQuery();
         // 充值记录查询query
@@ -653,6 +676,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 +910,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 +958,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 +975,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 +1040,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());
@@ -1117,6 +1145,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 +1524,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 +1563,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