From 6095587acf50adf93661c569bd95846443217434 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期日, 10 十一月 2024 20:55:36 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseController.java | 25 +++++++++++++++++++++----
1 files changed, 21 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 0f087d1..6fd7df4 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
@@ -483,6 +483,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);
}
@@ -643,8 +644,21 @@
}else{
clientCourseVO.setIsVip(0);
}
- // 查询学习人数和头像列表
- if (data!=null){
+ 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);
+ clientCourseVO.setIsBuy(1);
+ }else if (data!=null){
+ // 查询学习人数和头像列表
clientCourseVO.setCount(data.size());
if (data.size()>=5){
clientCourseVO.setHeaders(data.stream().limit(5).map(AppUser::getAvatar).collect(Collectors.toList()));
@@ -678,7 +692,7 @@
courseChapter.setRealLearnedNum(size+courseChapter.getVirtualLearnedNum());
}
clientCourseVO.setList(page);
- clientCourseVO.setIsBuy(0);
+ clientCourseVO.setIsBuy(2);
// 查询推荐课程
@@ -801,10 +815,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);
}
--
Gitblit v1.7.1