From 614b0106f079e67bb674a37ede2bd0fe3df2a430 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期四, 27 七月 2023 17:45:25 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 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 35a855e..763ec2b 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; @@ -67,14 +68,24 @@ /** * 获取已报名课包详情 - * @param coursePackageId + * @param coursePayId * @param appUserId * @return */ - CourseDetailsResponse queryRegisteredCourseDetails(Integer coursePackageId, Integer appUserId); + CourseDetailsResponse queryRegisteredCourseDetails(Integer 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