From 5f804115139dfdeeb2ce950a0f584b30f94b285c Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期六, 23 九月 2023 17:57:27 +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/TCoursePackageController.java | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java index e5268ae..fcef6e6 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java @@ -21,6 +21,7 @@ import com.dsh.guns.modular.system.service.ITSiteService; import com.dsh.guns.modular.system.util.ResultUtil; import io.swagger.models.auth.In; +import org.aspectj.weaver.ast.Var; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -69,7 +70,27 @@ - + /** + * 根据门店获取课程 + */ + @ResponseBody + @RequestMapping("/getCoursePackageByStoreId") + public List<TCoursePackageType> getCoursePackageByStoreId(Integer storeId){ + List<TCoursePackage> list = coursePackageClient.getCoursePackageByStoreId(storeId); + List<Integer> ids = new ArrayList<>(); + for (TCoursePackage tCoursePackage : list) { + ids.add(tCoursePackage.getCoursePackageTypeId()); + } + return coursePackageTypeClient.getByCourseIds(ids); + } + /** + * 根据课包类型获取课包 + */ + @ResponseBody + @RequestMapping("/getCoursePackageByType") + public List<TCoursePackage> getCoursePackageByType(Integer storeId){ + return coursePackageClient.getCoursePackageByType(storeId); + } /** * 跳转到列表页 * @param model -- Gitblit v1.7.1