From 8889371c686cb0b202370f0786968ae03c4210cf Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 18:50:45 +0800
Subject: [PATCH] 玩湃门店数据权限修改 收入管理增加世界杯记录
---
cloud-server-account/src/main/resources/mapper/TAppUserMapper.xml | 2 +-
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java | 10 +++++++++-
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 15 +++++++++++++++
3 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/cloud-server-account/src/main/resources/mapper/TAppUserMapper.xml b/cloud-server-account/src/main/resources/mapper/TAppUserMapper.xml
index 3a87c3b..3e06e1f 100644
--- a/cloud-server-account/src/main/resources/mapper/TAppUserMapper.xml
+++ b/cloud-server-account/src/main/resources/mapper/TAppUserMapper.xml
@@ -66,7 +66,7 @@
and t1.salesmanUserId = #{query.salesmanUser}
</if>
<if test="query.userIds!=null and query.userIds.size()>0">
- t1.id in
+ and t1.id in
<foreach collection="query.userIds" item="id" index="index" open="(" close=")" separator=",">
#{id}
</foreach>
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java
index f6a0238..b03944b 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java
@@ -50,6 +50,8 @@
@Resource
private ICoursePackagePaymentConfigService icppconfigService;
+ @Autowired
+ private ICoursePackageOrderService coursePackageOrderService;
@Autowired
@@ -72,9 +74,15 @@
if (courseIds.size() == 0) {
return new ArrayList<>();
} else {
- List<Integer> userIds = tcppmenService.list(new QueryWrapper<TCoursePackagePayment>().in("coursePackageId", courseIds)
+ List<Integer> userIds = tcppmenService.list(new QueryWrapper<TCoursePackagePayment>()
+ .in("coursePackageId", courseIds)
.eq("payStatus",2))
.stream().map(TCoursePackagePayment::getAppUserId).collect(Collectors.toList());
+ List<Integer> collect = coursePackageOrderService.list(new QueryWrapper<CoursePackageOrder>()
+ .in("coursePackageId", courseIds)
+ .eq("payStatus", 2)
+ ).stream().map(CoursePackageOrder::getAppUserId).collect(Collectors.toList());
+ userIds.addAll(collect);
return userIds;
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index c6e7d94..ec90d09 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -1026,6 +1026,21 @@
List<Integer> coursePackageByStoreIds = tCoursePackages.stream().distinct().map(TCoursePackage::getId).collect(Collectors.toList());
studentQeryDto.setCoursePackageIds(coursePackageByStoreIds);
}
+ // 如果当前登陆人是门店 只查询该门店下的课包的数据
+ if(UserExt.getUser().getObjectType() == 3){
+ // 先查询这个运营商下的所有门店ids
+
+ List<Integer> storeIds = new ArrayList<>();
+ storeIds.add(UserExt.getUser().getObjectId());
+ // 根据门店ids 查询所有课包ids
+ List<TCoursePackage> tCoursePackages = new ArrayList<>();
+ for (Integer storeId : storeIds) {
+ List<TCoursePackage> coursePackageByStoreId = coursePackageClient.getCoursePackageByStoreId(storeId);
+ tCoursePackages.addAll(coursePackageByStoreId);
+ }
+ List<Integer> coursePackageByStoreIds = tCoursePackages.stream().distinct().map(TCoursePackage::getId).collect(Collectors.toList());
+ studentQeryDto.setCoursePackageIds(coursePackageByStoreIds);
+ }
List<Map<String, Object>> pays = coursePackageClient.getStudentTotal(studentQeryDto);
return pays;
}
--
Gitblit v1.7.1