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/CoursePackagePaymentClient.java | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java index d178b29..fb25304 100644 --- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java +++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java @@ -4,12 +4,11 @@ import com.dsh.course.feignClient.course.model.QueryRegistrationRecord; import com.dsh.course.feignClient.course.model.QueryWalkInStudentList; import com.dsh.course.feignClient.course.model.TCoursePackagePayment; -import com.dsh.guns.modular.system.model.CoursePackagePayDTO; -import com.dsh.guns.modular.system.model.CoursePackagePaymentQuery; -import com.dsh.guns.modular.system.model.CoursePackagePaymentVO; +import com.dsh.guns.modular.system.model.*; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -20,7 +19,11 @@ @FeignClient("mb-cloud-course") public interface CoursePackagePaymentClient { - + /** + * 获取报名订单记录列表 + */ + @RequestMapping("/registerOrder/listAllRegister") + List<RegisterOrderVO> listAllRegister(@RequestBody RegisterOrderQuery query); /** * 添加购课记录-后台 * @return @@ -80,7 +83,16 @@ @PostMapping("/coursePackagePayment/editCoursePackagePayment") void editCoursePackagePayment(TCoursePackagePayment coursePackagePayment); + @PostMapping("/coursePackagePayment/editCoursePackagePayment1") + void editCoursePackagePayment1(@RequestBody TCoursePackagePayment coursePackagePayment); + @PostMapping("/coursePackagePayment/CountqueryByClassId") Integer queryByClassId(Integer id); + + @PostMapping("/coursePackagePayment/queryCourseData") + List<Map<String,Object>> queryCourseData(List<Integer> ids); + + @PostMapping("/coursePackagePayment/coursePt") + HashMap<String, Object> coursePt(List<Integer> userPt); } -- Gitblit v1.7.1