Merge remote-tracking branch 'origin/master'

luodangjia

2024-04-28 94e9dc3adb80baf6e1d7d56e54a93917996bc339

 rest/src/main/java/cn/stylefeng/rest/modular/user/controller/CourseController.java

@@ -190,6 +190,8 @@
            if (CollectionUtil.isNotEmpty(courseOrderList)){
                List<Long> courseIds = courseOrderList.stream().map(CourseOrder::getCourseId).collect(Collectors.toList());
                courseResponseDTOList.forEach(course1 -> {
                    //不返回内容 内容文件太大
                    course1.setCourseContent(null);
                   if (courseIds.contains(course1.getId())){
                       course1.setIsBuy(true);
                       CourseOrder courseOrder = this.courseOrderService.getOne(new LambdaQueryWrapper<CourseOrder>().select(CourseOrder::getId).eq(CourseOrder::getUserId, LoginContext.me().getLoginUser().getUserId()).eq(CourseOrder::getStatusFlag,1)
@@ -202,6 +204,12 @@
                       course1.setIsBuy(false);
                   }
                });
            }else{
                courseResponseDTOList.forEach(course1 -> {
                    //不返回内容 内容文件太大
                    course1.setCourseContent(null);
                    course1.setIsBuy(false);
                });
            }
         return  new SuccessResponseData<>(PageResultFactory.createPageResult(courseResponseDTOList,page.getTotal(), Convert.toInt(page.getSize()),Convert.toInt(page.getCurrent())));
        }