From ea73e0fcc705bd95c35ef95f17f98f482475a0dd Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 14 十一月 2024 13:50:52 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseController.java | 217 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 192 insertions(+), 25 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 07f5572..7578049 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
@@ -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;
@@ -312,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());
@@ -483,6 +484,7 @@
orderCourseVO.setGeneralPrice(meditation.getGeneralPrice());
orderCourseVO.setIosPrice(meditation.getIosPrice());
orderCourseVO.setCoverUrl(meditation.getCoverUrl());
+ orderCourseVO.setCoverDescription(meditation.getCoverDescription());
orderCourseVO.setCount(meditation.getRealLearnedNum()+meditation.getVirtualLearnedNum());
orderCourseVOS.add(orderCourseVO);
}
@@ -505,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;
@@ -621,6 +622,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){
@@ -643,9 +645,38 @@
}else{
clientCourseVO.setIsVip(0);
}
- // 查询学习人数和头像列表
- if (data!=null){
+ 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();
+ // 累加实际学习人数
+ 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);
+ }else if (data!=null){
+ // 查询学习人数和头像列表
clientCourseVO.setCount(data.size());
+ 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);
if (data.size()>=5){
clientCourseVO.setHeaders(data.stream().limit(5).map(AppUser::getAvatar).collect(Collectors.toList()));
}else{
@@ -657,6 +688,7 @@
clientCourseVO.setIsBuy(1);
}
}
+
}
// 查询是否已收藏课程
clientCourseVO.setIsCollect(courseUserFavoriteService.lambdaQuery()
@@ -672,18 +704,28 @@
.orderByDesc(CourseChapter::getSortNum)
.list();
for (CourseChapter courseChapter : page) {
- int size = courseLearningRecordService.lambdaQuery()
- .eq(CourseLearningRecord::getChapterId, courseChapter.getId())
- .list().size();
- courseChapter.setRealLearnedNum(size+courseChapter.getVirtualLearnedNum());
+ // 累加实际学习人数
+ int a = 0;
+ int b = 0;
+ Long data2 = remoteAppUserService.getCourseChapterHistoryCount(courseChapter.getId()).getData();
+ a+=data2;
+ b+=courseChapter.getVirtualLearnedNum();
+ courseChapter.setRealLearnedNum(a);
+ courseChapter.setVirtualLearnedNum(b);
+ LoginUser loginUser = tokenService.getLoginUser();
+ if (loginUser!=null){
+ Integer data1 = remoteAppUserService.getCourseChapterHistoryState(loginUser.getUserid(), courseChapter.getId()).getData();
+ courseChapter.setIsOver(data1);
+ }else{
+ courseChapter.setIsOver(2);
+ }
}
clientCourseVO.setList(page);
- clientCourseVO.setIsBuy(0);
-
// 查询推荐课程
List<Course> list = courseService.lambdaQuery().eq(Course::getCateId, byId.getCateId())
.eq(Course::getCourseType,1)
+ .ne(Course::getId,id)
.eq(Course::getRecommend, 1).list();
List<Course> courses = new ArrayList<>();
// 随机获取两个课程
@@ -692,18 +734,21 @@
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) {
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);
}
/**
@@ -767,6 +812,9 @@
cours.setCount(data1.size());
}
clientCourseVO.setList2(courses);
+ if (byId.getChargeType() == 1){
+ byId.setGeneralPrice(new BigDecimal("0"));
+ }
return R.ok(clientCourseVO);
}
@@ -801,10 +849,13 @@
.eq(CourseChapter::getCourseId, record.getId()).list();
// 章节列表累加虚拟学习人数
int temp = 0;
+ int temp1 = 0;
for (CourseChapter courseChapter : list) {
temp+=courseChapter.getVirtualLearnedNum();
+ Long data1 = remoteAppUserService.getCourseChapterHistoryCount(courseChapter.getId()).getData();
+ temp1+=data1;
}
- record.setCount(size1+temp);
+ record.setCount(temp1+temp);
}
return R.ok(coursePageList);
}
@@ -877,6 +928,11 @@
Course byId = courseService.getById(courseId);
AppUser data = remoteAppUserService.getAppUserById(userId + "").getData();
byId.setBalance(data.getBalance());
+ System.err.println("课程类型"+byId.getChargeType());
+ if (byId.getChargeType() == 1){
+ byId.setGeneralPrice(new BigDecimal("0"));
+ }
+ System.err.println("返回数据"+byId);
return R.ok(byId);
}
@PostMapping("/successOrder")
@@ -896,8 +952,16 @@
.eq(Course::getCourseType, 1).list();
for (Course course : list) {
List<AppUser> data = remoteAppUserService.getUserByCourseId(courseId).getData();
- course.setCount(data.size()+course.getVirtualLearnedNum());
- course.setRealLearnedNum(data.size()+course.getVirtualLearnedNum());
+ List<CourseChapter> list1 = courseChapterService.lambdaQuery().eq(CourseChapter::getCourseId, course).list();
+ int a = 0;
+ int b = 0;
+ for (CourseChapter courseChapter : list1) {
+ a+= courseChapter.getVirtualLearnedNum();
+ Long data1 = remoteAppUserService.getCourseChapterHistoryCount(courseChapter.getId()).getData();
+ b+=data1;
+ }
+ course.setCount(a+b);
+ course.setRealLearnedNum(a+b);
}
List<Course> courses = new ArrayList<>();
@@ -934,9 +998,42 @@
.list();
for (Course course : page) {
CourseVO courseVO = new CourseVO();
+ List<CourseChapter> list1 = courseChapterService.lambdaQuery().eq(CourseChapter::getCourseId, course.getId()).list();
+ int a = 0;
+ int b = 0;
+ for (CourseChapter courseChapter : list1) {
+ a+= courseChapter.getVirtualLearnedNum();
+ Long data1 = remoteAppUserService.getCourseChapterHistoryCount(courseChapter.getId()).getData();
+ b+=data1;
+ }
+ course.setCount(a+b);
+ course.setRealLearnedNum(a+b);
+ course.setVirtualLearnedNum(0);
BeanUtils.copyProperties(course, courseVO);
courseVOS.add(courseVO);
- studyPageVO.setCourseList(courseVOS);
+ }
+ }
+ List<Long> data1 = remoteAppUserService.getCourseHistoryByUserId(userId).getData();
+ for (Long l : data1) {
+ CourseChapter byId1 = courseChapterService.getById(l);
+ Course byId = courseService.getById(byId1.getCourseId());
+ 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);
}
}
// 查询两个相同类型的线上免费课程
@@ -945,20 +1042,65 @@
.eq(Course::getChargeType, 1)
.list();
// 远程查询用户观看历史
- List<Long> data1 = remoteAppUserService.getCourseHistoryByUserId(userId).getData();
if (!data1.isEmpty()){
// 随机获取两个
if (CollUtils.isNotEmpty(freeCourseList) && freeCourseList.size() > 2) {
- int size = freeCourseList.size();
- int index = (int) (Math.random() * size);
List<Course> courses = new ArrayList<>();
+ for (Course cours : freeCourseList) {
+ List<CourseChapter> list1 = courseChapterService.lambdaQuery().eq(CourseChapter::getCourseId, cours.getId()).list();
+ int a = 0;
+ int b = 0;
+ for (CourseChapter courseChapter : list1) {
+ a+= courseChapter.getVirtualLearnedNum();
+ Long data2 = remoteAppUserService.getCourseChapterHistoryCount(courseChapter.getId()).getData();
+ b+=data2;
+ }
+ cours.setCount(a+b);
+ cours.setRealLearnedNum(a+b);
+ cours.setVirtualLearnedNum(0);
+ }
for (int i = 0; i < 2; i++) {
- courses.add(freeCourseList.get(index));
+ courses.add(freeCourseList.get(i));
}
studyPageVO.setFreeCourseList(courses);
}else{
+ for (Course cours : freeCourseList) {
+ List<CourseChapter> list1 = courseChapterService.lambdaQuery().eq(CourseChapter::getCourseId, cours.getId()).list();
+ int a = 0;
+ int b = 0;
+ for (CourseChapter courseChapter : list1) {
+ a+= courseChapter.getVirtualLearnedNum();
+ Long data2 = remoteAppUserService.getCourseChapterHistoryCount(courseChapter.getId()).getData();
+ b+=data2;
+ }
+ cours.setCount(a+b);
+ cours.setRealLearnedNum(a+b);
+ }
studyPageVO.setFreeCourseList(freeCourseList);
}
+ for (Long l : data1) {
+ CourseChapter byId1 = courseChapterService.getById(l);
+ Course byId = courseService.getById(byId1.getCourseId());
+ 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);
+ }
+ }
+ studyPageVO.setCourseList(courseVOS);
return R.ok(studyPageVO);
}else{
List<Course> list1 = courseService.lambdaQuery()
@@ -969,6 +1111,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<>();
@@ -979,8 +1133,21 @@
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);
return R.ok(studyPageVO);
}
--
Gitblit v1.7.1