From cf6b7d7ebd13d2b6fe131112b92f5c607bebd868 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 25 十月 2023 17:14:30 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 75 ++++++++++++++++++++++++++-----------
1 files changed, 52 insertions(+), 23 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 97c2790..586013f 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
@@ -405,7 +405,8 @@
re.setPhone(appUser.getPhone());
re.setStoreName(store.getName());
// 在这里添加条件来删除不满足要求的元素
- if (appUser.getInsertType() != query.getInsertType()) {
+
+ if (query.getInsertType() !=null && appUser.getInsertType() != query.getInsertType()) {
iterator.remove(); // 使用迭代器的 remove 方法删除元素
}
}
@@ -436,8 +437,10 @@
resp.setTotalCourseNums(tCoursePackagePayment.getTotalClassHours());
resp.setResidueNums(tCoursePackagePayment.getLaveClassHours());
resp.setDeductionNums(tCoursePackagePayment.getTotalClassHours()-tCoursePackagePayment.getLaveClassHours());
+ if (tCoursePackage.getValidDays()!=null){
String afterDayDate = DateUtil.getAfterDayDate2(tCoursePackage.getInsertTime(),tCoursePackage.getValidDays() + "");
resp.setPeriodOfValidity(afterDayDate);
+ }
resps.add(resp);
}
}
@@ -752,26 +755,52 @@
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
})
public ResultUtil<List<AppUserVideoResponse>> queryAfterSourceList( CourseOfAfterRequest search){
- try {
- Integer appUserId = tokenUtil.getUserIdFormRedis();
+// try {
+// Integer appUserId = tokenUtil.getUserIdFormRedis();
+//
+// if(null == appUserId){
+// return ResultUtil.tokenErr();
+// }
+//
+// List<Integer> courseIds = new ArrayList<>();
+// QueryWrapper<TCoursePackagePayment> queryWrapper = new QueryWrapper<TCoursePackagePayment>().eq("appUserId", appUserId)
+// .groupBy("coursePackageId");
+// if (ToolUtil.isNotEmpty(search.getCourseTypeId())){
+// queryWrapper.eq("coursePackageId",search.getCourseTypeId());
+// }
+// List<TCoursePackagePayment> tCoursePackagePayments = packagePaymentService.list(queryWrapper);
+// if (tCoursePackagePayments.size() > 0 ){
+// courseIds = tCoursePackagePayments.stream().map(TCoursePackagePayment::getCoursePackageId).collect(Collectors.toList());
+// }
- if(null == appUserId){
- return ResultUtil.tokenErr();
- }
- List<Integer> courseIds = new ArrayList<>();
- QueryWrapper<TCoursePackagePayment> queryWrapper = new QueryWrapper<TCoursePackagePayment>().eq("appUserId", appUserId)
- .groupBy("coursePackageId");
+
+ QueryWrapper<CoursePackageStudent> queryWrapper1 = new QueryWrapper<CoursePackageStudent>().eq("appUserId", 19);
if (ToolUtil.isNotEmpty(search.getCourseTypeId())){
- queryWrapper.eq("coursePackageId",search.getCourseTypeId());
+ queryWrapper1.eq("coursePackageId",search.getCourseTypeId());
}
- List<TCoursePackagePayment> tCoursePackagePayments = packagePaymentService.list(queryWrapper);
- if (tCoursePackagePayments.size() > 0 ){
- courseIds = tCoursePackagePayments.stream().map(TCoursePackagePayment::getCoursePackageId).collect(Collectors.toList());
+
+ List<CoursePackageStudent> list = coursePackageStudentService.list(queryWrapper1);
+ List<Long> longs = new ArrayList<>();
+ for (CoursePackageStudent coursePackageStudent : list) {
+ longs.add(coursePackageStudent.getCoursePackageSchedulingId());
}
- return ResultUtil.success(packagePaymentService.queryAfterVideo(search,courseIds));
- }catch (Exception e){
- return ResultUtil.runErr();
- }
+
+ System.out.println("======longs========"+longs);
+ List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingService.list(new QueryWrapper<CoursePackageScheduling>().in("id",longs).isNotNull("courseId"));
+ List<AppUserVideoResponse> coursePackageSchedulings1 = coursePackageSchedulingService.queryAll(longs);
+
+
+
+
+ return ResultUtil.success(coursePackageSchedulings1);
+
+
+
+
+
+// }catch (Exception e){
+// return ResultUtil.runErr();
+// }
}
/**
@@ -1266,12 +1295,12 @@
@ResponseBody
@PostMapping("/base/coursePack/obtainStudentClassDetails")
public List<RecordAppoint> obtainStudentClassDetailsData(@RequestBody WeeksOfCourseRest stuId){
- try {
- return packagePaymentService.obtainStuClassDetails(stuId.getStuId(),stuId.getAppUserId());
- }catch (Exception e){
- e.printStackTrace();
- throw new RuntimeException();
- }
+// try {
+ return packagePaymentService.obtainStuClassDetails(stuId.getStuId(),stuId.getAppUserId(),stuId.getPageNum());
+// }catch (Exception e){
+// e.printStackTrace();
+// throw new RuntimeException();
+// }
}
--
Gitblit v1.7.1