From 3ad6b6ba2ba56fc0bcd2130e47190779c6e15acc Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期一, 04 十二月 2023 14:59:32 +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/course/feignClient/course/CourseStuddentClient.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseStuddentClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseStuddentClient.java index 7ac96bf..1171eb8 100644 --- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseStuddentClient.java +++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CourseStuddentClient.java @@ -2,11 +2,13 @@ import com.dsh.course.dto.ClassListDto; import com.dsh.course.dto.updateTimeDto; +import com.dsh.course.entity.CoursePackageOrderStudent; import com.dsh.course.feignClient.course.model.TCoursePackagePayment; import com.dsh.course.model.MoneyBack; import com.dsh.course.model.dto.InsertBackDto; import com.dsh.course.model.dto.StudentClassInfo; import com.dsh.guns.modular.system.model.CourseCounsum; +import com.dsh.guns.modular.system.model.CoursePackageOrder; import com.dsh.guns.modular.system.model.dto.ConsumeQuery; import com.dsh.guns.modular.system.model.dto.SelectDto; import com.dsh.guns.modular.system.model.dto.ToClassDto; @@ -93,7 +95,7 @@ @RequestMapping("/courdent/queryByIds") - List<TCoursePackagePayment> queryByIds(@RequestParam("ids")String ids); + List<CoursePackageOrderStudent> queryByIds(@RequestParam("ids")String ids); @RequestMapping("/courdent/queryCounsum") @@ -106,7 +108,7 @@ @PostMapping("/courdent/insertBack") - void insertBack(@RequestBody InsertBackDto insertBackDto); + Integer insertBack(@RequestBody InsertBackDto insertBackDto); @RequestMapping("/courdent/changeStatus") void changeStatus(@RequestParam("id")Integer id); @@ -120,4 +122,6 @@ @RequestMapping("/courdent/backStausClass") void backStausClass(@RequestParam("id")Integer id); + @RequestMapping("/courdent/getOrder") + List<CoursePackageOrder> getOrder(@RequestParam("id")Long id); } -- Gitblit v1.7.1