代码提交

无关风月

2024-11-10 6095587acf50adf93661c569bd95846443217434

代码提交

 xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseController.java

@@ -644,8 +644,21 @@
            }else{
                clientCourseVO.setIsVip(0);
            }
            // 查询学习人数和头像列表
            if (data!=null){
            if(byId.getChargeType() != 1){
                List<CourseChapter> list = courseChapterService.lambdaQuery().eq(CourseChapter::getCourseId, byId.getId())
                        .list();
                // 累加实际学习人数
                int a = 0;
                int b = 0;
                for (CourseChapter courseChapter : list) {
                    Long data2 = remoteAppUserService.getCourseChapterHistoryCount(courseChapter.getId()).getData();
                    a+=data2;
                    b+=courseChapter.getVirtualLearnedNum();
                }
                clientCourseVO.setCount(a+b);
                clientCourseVO.setIsBuy(1);
            }else if (data!=null){
                // 查询学习人数和头像列表
                clientCourseVO.setCount(data.size());
                if (data.size()>=5){
                    clientCourseVO.setHeaders(data.stream().limit(5).map(AppUser::getAvatar).collect(Collectors.toList()));

 xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/impl/MeditationEverydayServiceImpl.java

@@ -59,10 +59,6 @@
            MeditationEveryday meditationEveryday = meditationEverydayOpt.get();
            Long meditationId = meditationEveryday.getMeditationId();
            Meditation meditation = meditationMapper.selectById(meditationId);
            if (meditation!=null){
                vo.setImageUrl(meditation.getBackgroundUrl());
                vo.setTime(Integer.valueOf(meditation.getTutorAudioSecond()));
            }
            Optional<Meditation> meditationOpt = Optional.ofNullable(
                    meditationMapper.selectById(
                            meditationEveryday.getMeditationId()));
@@ -73,6 +69,10 @@
                vo = BeanUtils.copyBean(meditationEveryday,
                        ClientMeditationEverydayVO.class);
                vo.setClientMeditationVO(clientMeditationVO);
                if (meditation!=null){
                    vo.setImageUrl(meditation.getBackgroundUrl());
                    vo.setTime(Integer.valueOf(meditation.getTutorAudioSecond()));
                }
            }
        }
        return vo;