From c64adde7482103b05d623d8749c662e6fdf5d90d Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期五, 04 八月 2023 11:15:58 +0800
Subject: [PATCH] app端：开始上课的课程列表
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 008c336..4c913de 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
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.alipay.api.domain.Person;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -115,7 +116,6 @@
queryWrapper.in(PostCourseVideo::getCoursePackageId,courseIds);
}
videoList = pcvMapper.selectList(queryWrapper);
- // TODO: 2023/8/3 始终查出来是 空的
if (videoList.size() > 0){
List<Integer> videoIds = videoList.stream().map(PostCourseVideo::getCourseId).collect(Collectors.toList());
List<UserVideoDetails> userVideoDetails = uvdmapper.selectList(new QueryWrapper<UserVideoDetails>()
@@ -204,6 +204,7 @@
RegisterCourseVo registerCourseVo = new RegisterCourseVo();
registerCourseVo.setCoursePayId(tCoursePackagePayment.getId());
registerCourseVo.setCoursePackageId(tCoursePackagePayment.getCoursePackageId());
+ registerCourseVo.setCoursePackTypeId(coursePackage.getCoursePackageTypeId());
registerCourseVo.setPackageImg(coursePackage.getCoverDrawing());
String storeAndCourse = coursePackage.getName()+"("+ store.getName() +")";
registerCourseVo.setCourseNameStore(storeAndCourse);
@@ -217,6 +218,18 @@
registerCourseVo.setPayStatus(tCoursePackagePayment.getPayStatus());
courseVos.add(registerCourseVo);
}
+
+ if (ToolUtil.isNotEmpty(courseTypeId.getSearch())){
+ courseVos = courseVos.stream()
+ .filter(person -> person.getCourseNameStore().contains(courseTypeId.getSearch()))
+ .collect(Collectors.toList());
+ }
+
+ if (ToolUtil.isNotEmpty(courseTypeId.getCourseTypeId())){
+ courseVos = courseVos.stream()
+ .filter(person -> Objects.equals(person.getCoursePackTypeId(), courseTypeId.getCourseTypeId()))
+ .collect(Collectors.toList());
+ }
}
return courseVos;
}
--
Gitblit v1.7.1