10.24

nickchange

2023-10-24 d564437576c8f3f826bf4a08cf071b5b412efb46

 cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java

@@ -760,17 +760,41 @@
            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));

           List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingService.list(new QueryWrapper<CoursePackageScheduling>().in("id",longs).isNotNull("courseId"));
           List<AppUserVideoResponse> coursePackageSchedulings1 = coursePackageSchedulingService.queryAll();



            return ResultUtil.success(coursePackageSchedulings1);





        }catch (Exception e){
            return ResultUtil.runErr();
        }