From 1f9d05fd255fbd21356dad37527c7d33fda4fb8b Mon Sep 17 00:00:00 2001 From: liujie <liujie> Date: 星期五, 04 八月 2023 17:03:42 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java b/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java index 8d57092..13ebdf2 100644 --- a/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java +++ b/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.dsh.course.entity.TCoursePackagePayment; +import com.dsh.course.feignclient.model.RecordAppoint; import com.dsh.course.model.vo.RegisterCourseVo; import com.dsh.course.model.vo.request.ClasspaymentRequest; import com.dsh.course.model.vo.request.CourseOfAfterRequest; @@ -71,10 +72,20 @@ * @param appUserId * @return */ - CourseDetailsResponse queryRegisteredCourseDetails(Integer coursePayId, Integer appUserId); + CourseDetailsResponse queryRegisteredCourseDetails(Long coursePayId, Integer appUserId); ResultUtil ContinuationOrpaymentCourse(Integer userIdFormRedis, ClasspaymentRequest request); + /** + * 查询学员的课包上课记录 + * @param stuId + * @param appUserId + * @return + */ + List<RecordAppoint> obtainStuClassDetails(Integer stuId, Integer appUserId); + + ResultUtil insertVipPaymentCallback(String code, String orderNumber); + } -- Gitblit v1.7.1