From cf6b7d7ebd13d2b6fe131112b92f5c607bebd868 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 25 十月 2023 17:14:30 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 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..f5e6940 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
@@ -80,7 +80,23 @@
List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
model.addAttribute("list",list);
Integer roleType = UserExt.getUser().getObjectType();
+ if (roleType==2){
+ Integer objectId = UserExt.getUser().getObjectId();
+ List<TStore> operatorId = storeService.list(new QueryWrapper<TStore>().eq("operatorId", objectId));
+ model.addAttribute("stores",operatorId);
+ }else{
+ model.addAttribute("stores",new ArrayList<>());
+ }
+ // 获取所有课包类型
+ List<TCoursePackageType> tCoursePackageTypes = coursePackageTypeClient.queryAllCoursePackageType();
model.addAttribute("roleType",roleType);
+ if(UserExt.getUser().getObjectType()==3){
+ List<TStore> list1 = storeService.list(new LambdaQueryWrapper<TStore>().eq(TStore::getId, UserExt.getUser().getObjectId()));
+ model.addAttribute("stores",list1);
+ }else {
+ model.addAttribute("stores",new ArrayList<>());
+ }
+ model.addAttribute("coursePackageType",tCoursePackageTypes);
return PREFIX + "cpPayment_add.html";
}
/**
@@ -123,17 +139,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