From f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3 Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期三, 11 十月 2023 20:03:35 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackageClient.java | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackageClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackageClient.java index 87ca0c9..c5c328e 100644 --- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackageClient.java +++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackageClient.java @@ -1,13 +1,20 @@ package com.dsh.course.feignClient.course; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.dsh.course.dto.StudentQeryDto; import com.dsh.course.feignClient.course.model.QueryCoursePackageLists; import com.dsh.course.feignClient.course.model.QueryExamineCoursePackageLists; import com.dsh.course.feignClient.course.model.QueryRegistrationRecord; import com.dsh.course.feignClient.course.model.TCoursePackage; +import com.dsh.guns.modular.system.model.TCoursePackagePayment; +import com.dsh.guns.modular.system.model.dto.BallQueryDto; +import com.dsh.guns.modular.system.model.dto.PacQueryDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.ResponseBody; +import java.util.List; import java.util.Map; /** @@ -18,6 +25,16 @@ public interface CoursePackageClient { + /** + * 根据课包类型获取课包 + */ + @PostMapping("/base/coursePackage/getCoursePackageByType") + List<TCoursePackage> getCoursePackageByType(@RequestBody Integer typeId); + /** + * 根据门店id获取课包 + */ + @PostMapping("/base/coursePackage/getCoursePackageByStoreId") + List<TCoursePackage> getCoursePackageByStoreId(@RequestBody Integer storeId); /** * 获取课包管理列表数据 * @param queryCoursePackageLists @@ -60,4 +77,11 @@ @PostMapping("/coursePackage/queryExamineCoursePackageLists") Page<Map<String, Object>> queryExamineCoursePackageLists(QueryExamineCoursePackageLists queryExamineCoursePackageLists); + + @PostMapping("/courdent/getStudentTotal") + List<Map<String, Object>> getStudentTotal(StudentQeryDto studentQeryDto); + + + @PostMapping("/courdent/bypac") + List<Map<String, Object>> bypac(PacQueryDto pacQueryDto); } -- Gitblit v1.7.1