From 9823c85286da0041a729fe58cb38a62ff33fdced Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 11 十一月 2024 21:00:54 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseController.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 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 0187534..3fb34cf 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
@@ -623,6 +623,7 @@
Course byId = courseService.getById(id);
ClientCourseVO clientCourseVO = new ClientCourseVO();
BeanUtils.copyProperties(byId, clientCourseVO);
+ clientCourseVO.setIsBuy(2);
List<AppUser> data = remoteAppUserService.getUserByCourseId(id).getData();
if (byId.getChargeType()==1 && tokenService.getLoginUser()==null){
if (data!=null){
@@ -657,7 +658,6 @@
b+=courseChapter.getVirtualLearnedNum();
}
clientCourseVO.setCount(a+b);
- clientCourseVO.setIsBuy(1);
}else if (data!=null){
// 查询学习人数和头像列表
clientCourseVO.setCount(data.size());
@@ -705,8 +705,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();
@@ -716,7 +716,7 @@
}
}
clientCourseVO.setList(page);
- clientCourseVO.setIsBuy(2);
+
// 查询推荐课程
List<Course> list = courseService.lambdaQuery().eq(Course::getCateId, byId.getCateId())
.eq(Course::getCourseType,1)
@@ -1105,6 +1105,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<>();
@@ -1115,6 +1127,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