From 05100bf0452bea899f74e1b837e714f70362db63 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 26 九月 2023 19:06:18 +0800
Subject: [PATCH] app接口修改
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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 267859a..bc00abc 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
@@ -1290,7 +1290,7 @@
@ResponseBody
@PostMapping("/coursePackagePayment/editCoursePackagePayment")
public void editCoursePackagePayment(TCoursePackagePayment coursePackagePayment){
- coursePackagePayment.setCoursePackageId(null);
+ coursePackagePayment.setAppUserId(null);
packagePaymentService.updateById(coursePackagePayment);
}
@@ -1323,8 +1323,14 @@
if (ToolUtil.isEmpty(packagePayment) || packagePayment.size()==0){
return ResultUtil.error("该用户未购买该课包");
}
+ List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingMapper.selectList(new LambdaQueryWrapper<CoursePackageScheduling>()
+ .eq(CoursePackageScheduling::getCoursePackageId, Integer.valueOf(courseID))
+ .like(CoursePackageScheduling::getClassDate, time)
+ );
+
List<CoursePackageStudent> coursePackageStudent = cspsService.list(new LambdaQueryWrapper<CoursePackageStudent>()
.in(CoursePackageStudent::getCoursePackagePaymentId,packagePayment.stream().map(TCoursePackagePayment::getId).collect(Collectors.toList()))
+ .in(CoursePackageStudent::getCoursePackageSchedulingId,coursePackageSchedulings.stream().map(CoursePackageScheduling::getId).collect(Collectors.toList()))
.eq(CoursePackageStudent::getCoursePackageId,courseID)
.eq(CoursePackageStudent::getStudentId,stuId)
.eq(CoursePackageStudent::getAppUserId,appUserId)
@@ -1342,6 +1348,7 @@
}
return ResultUtil.success();
}catch (Exception e){
+ e.printStackTrace();
return ResultUtil.runErr();
}
}
@@ -1388,10 +1395,13 @@
String classEndTime = tCoursePackage.getClassEndTime();
String[] split1 = classEndTime.split(",");
ArrayList<String> strings = new ArrayList<>();
- for (int i1 = 0; i1 < split.length; i1++) {
- String s = split[i1] + "-" + split1[i1];
- strings.add(s);
+ if(ToolUtil.isNotEmpty(classStartTime)){
+ for (int i1 = 0; i1 < split.length; i1++) {
+ String s = split[i1].substring(0,5) + "-" + split1[i1].substring(0,5);
+ strings.add(s);
+ }
}
+
detailsListVo.setTime(strings);
List<CoursePackagePaymentConfig> list2 = icppcService.list(new LambdaQueryWrapper<CoursePackagePaymentConfig>().eq(CoursePackagePaymentConfig::getCoursePackageId, tCoursePackage.getId()).orderByAsc(CoursePackagePaymentConfig::getCashPayment));
if (list2.size() > 0) {
@@ -1405,6 +1415,9 @@
.eq(CoursePackageScheduling::getCoursePackageId, tCoursePackage.getId())
.like(CoursePackageScheduling::getClassDate, courseDetailReq.getTime())
);
+ if(list3.size()==0){
+ break;
+ }
List<Long> collect2 = list3.stream().map(CoursePackageScheduling::getId).collect(Collectors.toList());
if(collect2.size()==0){
collect2.add(-1l);
@@ -1416,12 +1429,13 @@
in(CoursePackageStudent::getCoursePackagePaymentId, ids)
);
- detailsListVo.setType(1);
+ detailsListVo.setType(1);
if(list4.size()>0){
Integer signInOrNot = list4.get(0).getSignInOrNot();
if(signInOrNot==2){
detailsListVo.setType(3);
}
+ detailsListVo.setIsType(list4.get(0).getType());
}
} else {
--
Gitblit v1.7.1