From fc076febec4f1e4b46beeca343f78010d8f8924d Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 24 十月 2023 21:06:44 +0800
Subject: [PATCH] 10.24。5
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
index aac4879..1dd80f7 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -760,17 +760,43 @@
if(null == appUserId){
return ResultUtil.tokenErr();
}
- List<Integer> courseIds = new ArrayList<>();
- QueryWrapper<TCoursePackagePayment> queryWrapper = new QueryWrapper<TCoursePackagePayment>().eq("appUserId", appUserId)
- .groupBy("coursePackageId");
+//
+// List<Integer> courseIds = new ArrayList<>();
+// QueryWrapper<TCoursePackagePayment> queryWrapper = new QueryWrapper<TCoursePackagePayment>().eq("appUserId", appUserId)
+// .groupBy("coursePackageId");
+// if (ToolUtil.isNotEmpty(search.getCourseTypeId())){
+// queryWrapper.eq("coursePackageId",search.getCourseTypeId());
+// }
+// List<TCoursePackagePayment> tCoursePackagePayments = packagePaymentService.list(queryWrapper);
+// if (tCoursePackagePayments.size() > 0 ){
+// courseIds = tCoursePackagePayments.stream().map(TCoursePackagePayment::getCoursePackageId).collect(Collectors.toList());
+// }
+
+
+ QueryWrapper<CoursePackageStudent> queryWrapper1 = new QueryWrapper<CoursePackageStudent>().eq("appUserId", appUserId);
if (ToolUtil.isNotEmpty(search.getCourseTypeId())){
- queryWrapper.eq("coursePackageId",search.getCourseTypeId());
+ queryWrapper1.eq("coursePackageId",search.getCourseTypeId());
}
- List<TCoursePackagePayment> tCoursePackagePayments = packagePaymentService.list(queryWrapper);
- if (tCoursePackagePayments.size() > 0 ){
- courseIds = tCoursePackagePayments.stream().map(TCoursePackagePayment::getCoursePackageId).collect(Collectors.toList());
+
+ List<CoursePackageStudent> list = coursePackageStudentService.list(queryWrapper1);
+ List<Long> longs = new ArrayList<>();
+ for (CoursePackageStudent coursePackageStudent : list) {
+ longs.add(coursePackageStudent.getCoursePackageSchedulingId());
}
- return ResultUtil.success(packagePaymentService.queryAfterVideo(search,courseIds));
+
+ System.out.println("======longs========"+longs);
+ List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingService.list(new QueryWrapper<CoursePackageScheduling>().in("id",longs).isNotNull("courseId"));
+ List<AppUserVideoResponse> coursePackageSchedulings1 = coursePackageSchedulingService.queryAll(longs);
+
+
+
+
+ return ResultUtil.success(coursePackageSchedulings1);
+
+
+
+
+
}catch (Exception e){
return ResultUtil.runErr();
}
--
Gitblit v1.7.1