From 0d17b6a250e455af9abd0b61b6de0004a296e98d Mon Sep 17 00:00:00 2001
From: java <linlangsur163@163.com>
Date: 星期二, 27 六月 2023 05:24:51 +0800
Subject: [PATCH] 课程信息：课时详情展示
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 8 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
index b240beb..e26735e 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -1,23 +1,24 @@
package com.dsh.course.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.course.entity.TCoursePackage;
import com.dsh.course.entity.TCoursePackagePayment;
import com.dsh.course.feignclient.model.CourseOfStoreVo;
import com.dsh.course.feignclient.model.StuCourseResp;
+import com.dsh.course.feignclient.model.StuSessionDetailsVo;
+import com.dsh.course.service.TCoursePackagePaymentService;
import com.dsh.course.service.TCoursePackageService;
-import com.dsh.course.servs.CoursePackagePaymentRepository;
+import com.dsh.course.util.DateUtil;
import io.swagger.annotations.Api;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
@Api
@CrossOrigin
@@ -27,8 +28,9 @@
private Logger logger = LoggerFactory.getLogger("business-log");
+
@Autowired
- private CoursePackagePaymentRepository coursePackagePaymentRepository;
+ private TCoursePackagePaymentService packagePaymentService;
@Autowired
private TCoursePackageService tcpService;
@@ -39,9 +41,9 @@
* @return 课包列表
*/
@PostMapping("/coursePack/queryPayment")
- public List<StuCourseResp> getStuCoursePackagePayment(Integer stuId){
+ public List<StuCourseResp> getStuCoursePackagePayment(@RequestBody Integer stuId,@RequestBody Integer appUserId){
List<StuCourseResp> resps = new ArrayList<>();
- List<TCoursePackagePayment> byUserId = coursePackagePaymentRepository.findByUserId(stuId);
+ List<TCoursePackagePayment> byUserId = packagePaymentService.queryAllCoursePackage(stuId,appUserId);
if (byUserId.size() > 0 ){
for (TCoursePackagePayment tCoursePackagePayment : byUserId) {
TCoursePackage tCoursePackage = tcpService.getById(tCoursePackagePayment.getCoursePackageId());
@@ -51,6 +53,7 @@
resp.setTotalCourseNums(tCoursePackagePayment.getTotalClassHours());
resp.setResidueNums(tCoursePackagePayment.getLaveClassHours());
resp.setDeductionNums(tCoursePackagePayment.getTotalClassHours()-tCoursePackagePayment.getLaveClassHours());
+ resps.add(resp);
}
}
return resps;
@@ -62,7 +65,43 @@
*/
@PostMapping("/coursePack/storeOfCourse")
public List<CourseOfStoreVo> getStuCourseWithStores(){
+ List<CourseOfStoreVo> courseOfStoreVos = tcpService.queryStoreOfCourse();
+ if (courseOfStoreVos.size() > 0){
+ for (CourseOfStoreVo courseOfStoreVo : courseOfStoreVos) {
+ String[] split = courseOfStoreVo.getClassWeeks().split(";");
+ List<Integer> integers = new ArrayList<>();
+ for (String s : split) {
+ int num = Integer.parseInt(s);
+ integers.add(num);
+ }
+ courseOfStoreVo.setClassWeekList(integers);
+ }
+ }
return tcpService.queryStoreOfCourse();
}
+
+ /**
+ *
+ * 课程名称列表
+ */
+ @PostMapping("/coursePack/sessionNames")
+ public List<StuSessionDetailsVo> getStuSessionList(@RequestBody Integer stuId,@RequestBody Integer appUserId){
+ List<StuSessionDetailsVo> detailsVos = new ArrayList<>();
+ List<TCoursePackagePayment> byUserId = packagePaymentService.queryAllCoursePackage(stuId,appUserId);
+ if (byUserId.size() > 0){
+ List<Integer> collect = byUserId.stream().map(TCoursePackagePayment::getCoursePackageId).collect(Collectors.toList());
+ List<TCoursePackage> list = tcpService.list(new QueryWrapper<TCoursePackage>()
+ .in("id", collect));
+ list.forEach(vo -> {
+ StuSessionDetailsVo detVo = new StuSessionDetailsVo();
+ detVo.setSessionid(vo.getId());
+ detVo.setSessionName(vo.getName());
+ String afterDayDate = DateUtil.getAfterDayDate2(vo.getInsertTime(),vo.getValidDays() + "");
+ detVo.setPeriodOfValidity(afterDayDate);
+ detailsVos.add(detVo);
+ });
+ }
+ return detailsVos;
+ }
}
--
Gitblit v1.7.1