From 5ebaf01f27ea05c7f40def8b2e7ac65ce6c084de Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 25 十月 2023 17:10:59 +0800
Subject: [PATCH] 10.20

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoursePackagePaymentController.java |   24 +++++++++++++++++-------
 1 files changed, 17 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..8193b91 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,17 @@
         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);
+        model.addAttribute("coursePackageType",tCoursePackageTypes);
         return PREFIX + "cpPayment_add.html";
     }
     /**
@@ -123,17 +133,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