From e5b1b6dafddcb32fb910abccbfa6bd98a0d64c0a Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期五, 04 八月 2023 18:09:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/entity/CoursePackageStudent.java | 2 +-
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 38 ++++++++++++++++++++++++++++----------
2 files changed, 29 insertions(+), 11 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 331c57c..9fe7b3d 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
@@ -169,7 +169,7 @@
System.out.println(StrUtils.dealStrToList(classWeeks).contains(DateTimeHelper.getDayOfWeek(parse)));
if (expirationDate.after(parse) && StrUtils.dealStrToList(classWeeks).contains(DateTimeHelper.getDayOfWeek(parse))){
CourseOfStoreVo storeVo = new CourseOfStoreVo();
- storeVo.setCourseId(packageStudent.getId());
+ storeVo.setCourseId(tCoursePackagePayment.getId());
storeVo.setCourseName(tCoursePackage.getName());
storeVo.setClassStartTime(tCoursePackage.getClassStartTime());
storeVo.setClassEndTime(tCoursePackage.getClassEndTime());
@@ -813,7 +813,7 @@
@ApiOperation(value = "上课主页-预约操作", tags = {"APP-开始上课"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
- @ApiImplicitParam(value = "上课记录id", name = "coursePackId", required = true, dataType = "String"),
+ @ApiImplicitParam(value = "课包id", name = "courseID", required = true, dataType = "String"),
@ApiImplicitParam(value = "时间 yyyy-MM-dd", name = "time", required = true, dataType = "String"),
@ApiImplicitParam(value = "学员id", name = "time", required = true, dataType = "int"),
})
@@ -824,17 +824,35 @@
if(null == appUserId){
return ResultUtil.tokenErr();
}
- CoursePackageStudent coursePackageStudent = cspsService.getOne(new LambdaQueryWrapper<CoursePackageStudent>()
- .eq(CoursePackageStudent::getId,courseID)
- .eq(CoursePackageStudent::getAppUserId,appUserId)
- .eq(CoursePackageStudent::getStudentId,stuId));
- if (ToolUtil.isEmpty(coursePackageStudent)){
+ TCoursePackagePayment packagePayment = packagePaymentService.getOne(new LambdaQueryWrapper<TCoursePackagePayment>()
+ .eq(TCoursePackagePayment::getId,courseID )
+ .eq(TCoursePackagePayment::getAppUserId,appUserId)
+ .eq(TCoursePackagePayment::getStudentId,stuId)
+ );
+
+ if (ToolUtil.isEmpty(packagePayment)){
ResultUtil.error("该用户未购买该课包");
}
- coursePackageStudent.setReservationStatus(1);
- coursePackageStudent.setInsertTime(simpleDateFormat.parse(time));
- cspsService.updateById(coursePackageStudent);
+ CoursePackageStudent coursePackageStudent = cspsService.getOne(new LambdaQueryWrapper<CoursePackageStudent>()
+ .eq(CoursePackageStudent::getCoursePackageId,packagePayment.getCoursePackageId())
+ .eq(CoursePackageStudent::getCoursePackagePaymentId,courseID)
+ .eq(CoursePackageStudent::getStudentId,stuId)
+ .eq(CoursePackageStudent::getAppUserId,appUserId)
+ );
+ if (ToolUtil.isNotEmpty(coursePackageStudent) && coursePackageStudent.getReservationStatus() == 0){
+ coursePackageStudent.setReservationStatus(1);
+ coursePackageStudent.setInsertTime(simpleDateFormat.parse(time));
+ cspsService.updateById(coursePackageStudent);
+ }else {
+ coursePackageStudent.setAppUserId(appUserId);
+ coursePackageStudent.setStudentId(stuId);
+ coursePackageStudent.setCoursePackageId(packagePayment.getCoursePackageId());
+ coursePackageStudent.setCoursePackagePaymentId(Long.parseLong(courseID));
+ coursePackageStudent.setReservationStatus(1);
+ coursePackageStudent.setInsertTime(simpleDateFormat.parse(time));
+ cspsService.save(coursePackageStudent);
+ }
return ResultUtil.success();
}catch (Exception e){
return ResultUtil.runErr();
diff --git a/cloud-server-course/src/main/java/com/dsh/course/entity/CoursePackageStudent.java b/cloud-server-course/src/main/java/com/dsh/course/entity/CoursePackageStudent.java
index 986b38d..15678af 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/entity/CoursePackageStudent.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/entity/CoursePackageStudent.java
@@ -52,7 +52,7 @@
* 课包购买记录id
*/
@TableField("coursePackagePaymentId")
- private Integer coursePackagePaymentId;
+ private Long coursePackagePaymentId;
/**
* 到课状态（0=否，1=是）
*/
--
Gitblit v1.7.1