代码提交

无关风月

2024-11-11 41b9950b03bafeb5fa90770794faf9baeacade6b

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

@@ -45,6 +45,7 @@
import io.swagger.annotations.ApiOperation;

import java.io.IOException;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -737,8 +738,11 @@
            List<AppUser> data3 = remoteAppUserService.getUserByCourseId(id).getData();
            cours.setCount(data3.size());
        }
        clientCourseVO.setList2(courses);

        clientCourseVO.setList2(courses);
        if (byId.getChargeType() == 1){
            byId.setGeneralPrice(new BigDecimal("0"));
        }
        return R.ok(clientCourseVO);
    }
    /**
@@ -802,6 +806,9 @@
            cours.setCount(data1.size());
        }
        clientCourseVO.setList2(courses);
        if (byId.getChargeType() == 1){
            byId.setGeneralPrice(new BigDecimal("0"));
        }
        return R.ok(clientCourseVO);
    }

@@ -1043,20 +1050,24 @@
            for (Long l : data1) {
                CourseChapter byId1 = courseChapterService.getById(l);
                Course byId = courseService.getById(byId1.getCourseId());
                CourseVO courseVO = new CourseVO();
                BeanUtils.copyProperties(byId, courseVO);
                List<CourseChapter> list1 = courseChapterService.lambdaQuery().eq(CourseChapter::getCourseId, byId1.getCourseId()).list();
                int a = 0;
                int b = 0;
                for (CourseChapter courseChapter : list1) {
                    a+= courseChapter.getVirtualLearnedNum();
                    Long data2 = remoteAppUserService.getCourseChapterHistoryCount(courseChapter.getId()).getData();
                    b+=data2;
                if (byId!=null){
                    CourseVO courseVO = new CourseVO();
                    BeanUtils.copyProperties(byId, courseVO);
                    List<CourseChapter> list1 = courseChapterService.lambdaQuery().eq(CourseChapter::getCourseId, byId1.getCourseId()).list();
                    int a = 0;
                    int b = 0;
                    for (CourseChapter courseChapter : list1) {
                        a+= courseChapter.getVirtualLearnedNum();
                        Long data2 = remoteAppUserService.getCourseChapterHistoryCount(courseChapter.getId()).getData();
                        b+=data2;
                    }
                    courseVO.setCount(a+b);
                    courseVO.setRealLearnedNum(a+b);
                    courseVO.setVirtualLearnedNum(0);
                    courseVO.setId(byId.getId());
                    courseVO.setCoverUrl(byId.getCoverUrl());
                    courseVOS.add(courseVO);
                }
                courseVO.setCount(a+b);
                courseVO.setRealLearnedNum(a+b);
                courseVO.setVirtualLearnedNum(0);
                courseVOS.add(courseVO);
            }
            studyPageVO.setCourseList(courseVOS);
            return R.ok(studyPageVO);
@@ -1082,7 +1093,6 @@
                studyPageVO.setFreeCourseList(courses);
            }
            studyPageVO.setCourseList(courseVOS);

            return R.ok(studyPageVO);
        }