From f5ca8f01cf6b8256a25e8c6838d805fe3fca43fc Mon Sep 17 00:00:00 2001 From: liujie <liujie> Date: 星期一, 07 八月 2023 11:34:21 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java index 2e0b74f..5f79b5f 100644 --- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java +++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java @@ -1,5 +1,6 @@ package com.dsh.account.feignclient.course; +import com.dsh.account.feignclient.competition.model.BillingDataRequestVo; import com.dsh.account.feignclient.course.model.*; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -13,11 +14,11 @@ @PostMapping("/base/coursePack/queryPayment") - List<StuCourseResp> getStuCoursePayment(); + List<StuCourseResp> getStuCoursePayment(@RequestBody Integer stuId); @PostMapping("/base/coursePack/storeOfCourse") - List<CourseOfStoreVo> getStoreOfCourses(); + List<CourseOfStoreVo> getStoreOfCourses(@RequestBody WeeksOfCourseRest courseRest); @PostMapping("/base/coursePack/stuOfCourses") StuWithCoursesListVo getStuOfCoursesDetails(@RequestBody GetStuOfCoursesDetails getStuOfCoursesDetails); @@ -44,12 +45,19 @@ public boolean delPaymentCoursePackage(@RequestBody Integer payId); @PostMapping("/base/coursePack/updatePaymentCoursePackage") - void updatePaymentCoursePackage(TCoursePackagePayment coursePackagePayment); + void updatePaymentCoursePackage(@RequestBody TCoursePackagePayment coursePackagePayment); @PostMapping("/base/coursePack/savePaymentCoursePackage") public boolean savePaymentCoursePackage(@RequestBody TCoursePackagePayment packagePayment); @PostMapping("/base/coursePack/allAmountPayRecordOfUser") - public List<TCoursePackagePayment> getAmountPayRecord(@RequestBody Integer appUserId); + public List<TCoursePackagePayment> getAmountPayRecord(@RequestBody BillingDataRequestVo appUserId); + + @PostMapping("/base/coursePack/obtainStudentClassDetails") + List<RecordAppoint> obtainStudentClassDetailsData(@RequestBody WeeksOfCourseRest stuId); + + + @PostMapping("/base/coursePack/getCoursePackagePaymentOfCode") + List<TCoursePackagePayment> getCoursePackagePaymentOfCode(@RequestBody String code); } -- Gitblit v1.7.1