From 4fa2598a31a505927eeb585ae25a3bb6902041cd Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期五, 04 八月 2023 12:11:39 +0800
Subject: [PATCH] app端：课后练习视频列表的bug
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
index 160a3dd..8b0ad37 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
@@ -116,6 +116,7 @@
queryWrapper.in(PostCourseVideo::getCoursePackageId,courseIds);
}
videoList = pcvMapper.selectList(queryWrapper);
+ System.out.println(videoList);
if (videoList.size() > 0){
List<Integer> videoIds = videoList.stream().map(PostCourseVideo::getCourseId).collect(Collectors.toList());
List<UserVideoDetails> userVideoDetails = uvdmapper.selectList(new QueryWrapper<UserVideoDetails>()
@@ -129,23 +130,23 @@
BenefitsVideos videosWithIds = bfvoClient.getVideosWithIds(userVideoDetail.getCourseId());
response.setVideoId(userVideoDetail.getCourseId());
response.setCoverImage(videosWithIds.getCover());
- if (null != search.getSearch()){
-// 根据正则模糊匹配
- String pattern = ".*" + search.getSearch() + ".*";
- Pattern regex = Pattern.compile(pattern);
- Matcher matcher = regex.matcher(videosWithIds.getName());
- if (matcher.matches()) {
- response.setVideoName(videosWithIds.getName());
- }
- }else {
- response.setVideoName(videosWithIds.getName());
- }
+ response.setVideoName(videosWithIds.getName());
response.setSynopsis(videosWithIds.getIntroduction());
response.setIntegral(videosWithIds.getIntegral());
response.setStudyStatus(userVideoDetail.getState());
responses.add(response);
}
Collections.sort(responses, Comparator.comparing(AppUserVideoResponse::getStudyStatus));
+ }
+ if (ToolUtil.isNotEmpty(search.getSearch())){
+ responses = responses.stream()
+ .filter(person -> person.getPackageName().contains(search.getSearch()))
+ .collect(Collectors.toList());
+ }
+ if (ToolUtil.isNotEmpty(search.getCourseTypeId())){
+ responses = responses.stream()
+ .filter(person -> Objects.equals(person.getCoursePackageId(), search.getCourseTypeId()))
+ .collect(Collectors.toList());
}
}
return responses;
@@ -197,6 +198,7 @@
List<RegisterCourseVo> courseVos = new ArrayList<>();
List<TCoursePackagePayment> tCoursePackagePayments = this.list(new QueryWrapper<TCoursePackagePayment>()
.eq("appUserId",appUserId ));
+ System.out.println(tCoursePackagePayments);
if (tCoursePackagePayments.size() > 0){
for (TCoursePackagePayment tCoursePackagePayment : tCoursePackagePayments) {
TCoursePackage coursePackage = tcpmapper.selectById(tCoursePackagePayment.getCoursePackageId());
--
Gitblit v1.7.1