From 80b4175382a9030ecb9722d8a080c12a41001871 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 25 十月 2023 09:41:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java
index a0d9606..77fda77 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java
@@ -31,7 +31,7 @@
import java.util.stream.Collectors;
/**
- * 购课记录控制器
+ * 广告管理控制器
*
*/
@Controller
@@ -123,17 +123,17 @@
@ResponseBody
public List<CoursePackagePaymentVO> listAll(CoursePackagePaymentQuery query) {
Integer objectType = UserExt.getUser().getObjectType();
+ List<Integer> ids =new ArrayList<>();
+ if(objectType==3){
+ // 找出当前门店的课包
+ ids = coursePackageClient.queryIdsByStore(UserExt.getUser().getObjectId());
+ query.setIds(ids);
+ }
if (objectType == 2){
Integer objectId = UserExt.getUser().getObjectId();
List<Integer> operatorId = storeService.list(new QueryWrapper<TStore>().eq("operatorId", objectId))
.stream().map(TStore::getId).collect(Collectors.toList());
query.setStoreIds(operatorId);
- }
- if (objectType == 3){
- Integer objectId = UserExt.getUser().getObjectId();
- List<Integer> list = new ArrayList<>();
- list.add(objectId);
- query.setStoreIds(list);
}
return coursePackagePaymentClient.listAll(query);
}
--
Gitblit v1.7.1