From d643b843cc794d8f59c4ecd04bda2b9d35e5b22a Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期二, 28 十一月 2023 19:54:22 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackageService.java | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackageService.java b/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackageService.java index 4708c1c..567e34d 100644 --- a/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackageService.java +++ b/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackageService.java @@ -24,9 +24,9 @@ List<CourseOfStoreVo> queryStoreOfCourse(); - /** * 获取课程列表 + * * @param coursePackageList * @return * @throws Exception @@ -36,6 +36,7 @@ /** * 获取课包详情 + * * @param uid * @param id * @return @@ -46,6 +47,7 @@ /** * 课程报名支付 + * * @param uid * @param paymentCourseVo * @return @@ -56,6 +58,7 @@ /** * 获取课包管理列表数据 + * * @param queryCoursePackageLists * @return */ @@ -64,6 +67,7 @@ /** * 添加课包 + * * @param coursePackage * @return */ @@ -72,14 +76,15 @@ /** * 修改数据 + * * @param coursePackage */ void updateCoursePackageById(TCoursePackage coursePackage); - /** * 获取课包审核列表 + * * @param queryExamineCoursePackageLists * @return */ @@ -87,6 +92,20 @@ List<Map<String, Object>> queryByConfigId(Integer oneId); - String getHours(Integer coursePackageId); + List<Integer> getHours(Integer coursePackageId); + ResultUtil paymentCourseCouponList(Integer uid, Integer coursePackagePaymentConfigId); + + + List<CoursePackageListVo> queryCourseListOne(CoursePackageList coursePackageList) throws Exception; + + + /** + * 购买课程支付成功后的回调处理 + * + * @param code + * @param trade_no + * @return + */ + ResultUtil paymentCourseCallback(String code, String trade_no, String attach); } -- Gitblit v1.7.1