From 353cf91d3679e68d9b8c07652e4f7791d606dbd4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 15 十一月 2024 15:14:39 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseController.java | 55 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 44 insertions(+), 11 deletions(-)
diff --git a/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseController.java b/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseController.java
index b583f5e..2925f85 100644
--- a/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseController.java
+++ b/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseController.java
@@ -313,7 +313,7 @@
.eq(Objects.nonNull(courseDTO.getCourseType()), Course::getCourseType, courseDTO.getCourseType())
.eq(Objects.nonNull(courseDTO.getChargeType()), Course::getChargeType, courseDTO.getChargeType())
.eq(Objects.nonNull(courseDTO.getListingStatus()), Course::getListingStatus, courseDTO.getListingStatus())
- .orderByDesc(Course::getSortNum);
+ .orderByDesc(Course::getCreateTime);
if (org.springframework.util.StringUtils.hasLength(courseDTO.getCourseTitle())){
List<Long> collect = courseService.lambdaQuery().like(Course::getCourseTitle, courseDTO.getCourseTitle()).list()
.stream().map(Course::getId).collect(Collectors.toList());
@@ -507,16 +507,15 @@
orderCourseVO.setGeneralPrice(record.getGeneralPrice());
orderCourseVO.setIosPrice(record.getIosPrice());
orderCourseVO.setCoverUrl(record.getCoverUrl());
- List<AppUser> data1 = remoteAppUserService.getUserByCourseId(record.getId()).getData();
-
List<CourseChapter> list = courseChapterService.lambdaQuery().eq(CourseChapter::getCourseId, record.getId()).list();
int temp = 0 ;
+ int temp1 = 0 ;
for (CourseChapter courseChapter : list) {
temp+= courseChapter.getVirtualLearnedNum();
+ Long data2 = remoteAppUserService.getCourseChapterHistoryCount(courseChapter.getId()).getData();
+ temp1+=data2;
}
- int size = courseLearningRecordService.lambdaQuery().eq(CourseLearningRecord::getCourseId, record.getId())
- .groupBy(CourseLearningRecord::getAppUserId).list().size();
- orderCourseVO.setCount(temp+size);
+ orderCourseVO.setCount(temp+temp1);
orderCourseVOS.add(orderCourseVO);
}
break;
@@ -646,6 +645,12 @@
}else{
clientCourseVO.setIsVip(0);
}
+ List<Long> collect9 = data.stream().map(AppUser::getId).collect(Collectors.toList());
+ if (!collect9.isEmpty()){
+ if (collect9.contains(userId)){
+ clientCourseVO.setIsBuy(1);
+ }
+ }
if(byId.getChargeType() != 1){
List<CourseChapter> list = courseChapterService.lambdaQuery().eq(CourseChapter::getCourseId, byId.getId())
.list();
@@ -658,7 +663,6 @@
b+=courseChapter.getVirtualLearnedNum();
}
clientCourseVO.setCount(a+b);
- clientCourseVO.setIsBuy(1);
}else if (data!=null){
// 查询学习人数和头像列表
clientCourseVO.setCount(data.size());
@@ -706,8 +710,8 @@
Long data2 = remoteAppUserService.getCourseChapterHistoryCount(courseChapter.getId()).getData();
a+=data2;
b+=courseChapter.getVirtualLearnedNum();
- courseChapter.setRealLearnedNum(a+b);
- courseChapter.setVirtualLearnedNum(0);
+ courseChapter.setRealLearnedNum(a);
+ courseChapter.setVirtualLearnedNum(b);
LoginUser loginUser = tokenService.getLoginUser();
if (loginUser!=null){
Integer data1 = remoteAppUserService.getCourseChapterHistoryState(loginUser.getUserid(), courseChapter.getId()).getData();
@@ -721,6 +725,8 @@
// 查询推荐课程
List<Course> list = courseService.lambdaQuery().eq(Course::getCateId, byId.getCateId())
.eq(Course::getCourseType,1)
+ .eq(Course::getListingStatus,1)
+ .ne(Course::getId,id)
.eq(Course::getRecommend, 1).list();
List<Course> courses = new ArrayList<>();
// 随机获取两个课程
@@ -729,10 +735,10 @@
int index = (int) (Math.random() * size);
if (size >= 2){
for (int i = 0; i < 2; i++) {
- courses.add(list.get(index));
+ courses.add(list.get(i));
}
}else{
- courses.add(list.get(index));
+ courses.addAll(list);
}
}
for (Course cours : courses) {
@@ -788,6 +794,8 @@
// 查询推荐课程
List<Course> list = courseService.lambdaQuery().eq(Course::getCateId, byId.getCateId())
.eq(Course::getCourseType,1)
+ .eq(Course::getListingStatus,1)
+ .ne(Course::getId,id)
.eq(Course::getRecommend, 1).list();
List<Course> courses = new ArrayList<>();
// 随机获取两个课程
@@ -943,6 +951,7 @@
Long userId = loginUser.getUserid();
Course byId = courseService.getById(courseId);
List<Course> list = courseService.lambdaQuery().eq(Course::getCateId, byId.getCateId())
+ .eq(Course::getListingStatus,1)
.ne(Course::getId,courseId)
.eq(Course::getCourseType, 1).list();
for (Course course : list) {
@@ -1106,6 +1115,18 @@
List<Course> courses = new ArrayList<>();
courses.add(list1.get(0));
courses.add(list1.get(1));
+ for (Course cours : courses) {
+ List<CourseChapter> list3 = courseChapterService.lambdaQuery().eq(CourseChapter::getCourseId, cours.getId()).list();
+ int a = 0;
+ int b = 0;
+ for (CourseChapter courseChapter : list3) {
+ a+= courseChapter.getVirtualLearnedNum();
+ Long data2 = remoteAppUserService.getCourseChapterHistoryCount(courseChapter.getId()).getData();
+ b+=data2;
+ }
+ cours.setCount(a+b);
+ cours.setRealLearnedNum(a+b);
+ }
studyPageVO.setFreeCourseList(courses);
}else if (list1.size()==1){
List<Course> courses = new ArrayList<>();
@@ -1116,6 +1137,18 @@
break;
}
}
+ for (Course cours : courses) {
+ List<CourseChapter> list3 = courseChapterService.lambdaQuery().eq(CourseChapter::getCourseId, cours.getId()).list();
+ int a = 0;
+ int b = 0;
+ for (CourseChapter courseChapter : list3) {
+ a+= courseChapter.getVirtualLearnedNum();
+ Long data2 = remoteAppUserService.getCourseChapterHistoryCount(courseChapter.getId()).getData();
+ b+=data2;
+ }
+ cours.setCount(a+b);
+ cours.setRealLearnedNum(a+b);
+ }
studyPageVO.setFreeCourseList(courses);
}
studyPageVO.setCourseList(courseVOS);
--
Gitblit v1.7.1