From d09828cdec78a160f4530a8ab245216ed8671c27 Mon Sep 17 00:00:00 2001 From: liujie <liujie> Date: 星期三, 20 九月 2023 18:43:48 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java | 70 ++++++++++++++++++++++++++++++++--- 1 files changed, 64 insertions(+), 6 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 616f8ba..f659ea8 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 @@ -1,16 +1,21 @@ package com.dsh.course.service; +import com.baomidou.mybatisplus.extension.api.R; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.QueryRegistrationRecord; +import com.dsh.course.model.QueryWalkInStudentList; +import com.dsh.course.model.BillingRequest; import com.dsh.course.model.vo.RegisterCourseVo; -import com.dsh.course.model.vo.request.CourseOfAfterRequest; -import com.dsh.course.model.vo.request.CourseWithDetailsRequest; -import com.dsh.course.model.vo.request.UpdateCourseVideoStatusRequest; -import com.dsh.course.model.vo.response.AppUserVideoResponse; -import com.dsh.course.model.vo.response.CourseOfVideoResponse; +import com.dsh.course.model.vo.request.*; +import com.dsh.course.model.vo.response.*; +import com.dsh.course.util.ResultUtil; import java.util.Date; import java.util.List; +import java.util.Map; /** * <p> @@ -22,7 +27,6 @@ */ public interface TCoursePackagePaymentService extends IService<TCoursePackagePayment> { - List<TCoursePackagePayment> queryAllCoursePackage(Date startTime, Date endTime ,Integer lessionId,Integer stuId, Integer appUserId); /** @@ -64,4 +68,58 @@ */ List<RegisterCourseVo> queryRegisteredCourseList(CourseOfAfterRequest courseTypeId, Integer appUserId); + /** + * 获取已报名课包详情 + * @param coursePayId + * @param appUserId + * @return + */ + 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); + + List<BillingRequest> queryAmountDatas(Integer appUserId, String monthStart, String monthEnd); + + + /** + * 获取课包报名信息 + * @param page + * @param queryRegistrationRecord + * @return + */ + List<Map<String, Object>> queryRegistrationRecord(Page<Map<String, Object>> page, QueryRegistrationRecord queryRegistrationRecord); + + + /** + * 获取未预约排课学员列表 + * @param page + * @param queryWalkInStudentList + * @return + */ + List<Map<String, Object>> queryWalkInStudentList(Page<Map<String, Object>> page, QueryWalkInStudentList queryWalkInStudentList); + + List<PayCourseRes> getMyCourseList(Integer storeId, Integer appUserId); + + + PayCourseInfoReq payCourseInfo(Integer courseId); + + + ResultUtil payCourse(PayCourseReq req, Integer userId); + + + void updateUseTime(Long id, Date date); + + List<Integer> getStudentIds(Integer payId); } -- Gitblit v1.7.1