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 | 105 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 82 insertions(+), 23 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 b3f2b0d..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
@@ -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;
@@ -622,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){
@@ -656,7 +658,6 @@
b+=courseChapter.getVirtualLearnedNum();
}
clientCourseVO.setCount(a+b);
- clientCourseVO.setIsBuy(1);
}else if (data!=null){
// 查询学习人数和头像列表
clientCourseVO.setCount(data.size());
@@ -704,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();
@@ -715,7 +716,7 @@
}
}
clientCourseVO.setList(page);
- clientCourseVO.setIsBuy(2);
+
// 查询推荐课程
List<Course> list = courseService.lambdaQuery().eq(Course::getCateId, byId.getCateId())
.eq(Course::getCourseType,1)
@@ -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);
}
@@ -915,6 +922,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")
@@ -995,18 +1007,38 @@
courseVOS.add(courseVO);
}
}
+ 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);
+ }
+ }
// 查询两个相同类型的线上免费课程
List<Course> freeCourseList = courseService.lambdaQuery()
.eq(Course::getCourseType, 1)
.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();
@@ -1022,7 +1054,7 @@
cours.setVirtualLearnedNum(0);
}
for (int i = 0; i < 2; i++) {
- courses.add(freeCourseList.get(index));
+ courses.add(freeCourseList.get(i));
}
studyPageVO.setFreeCourseList(courses);
}else{
@@ -1043,20 +1075,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);
@@ -1069,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<>();
@@ -1079,10 +1127,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