From 424dbec2615a0e80217c4b363eed33ddd04adb48 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 28 十一月 2023 16:03:13 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java | 3 -
cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java | 89 ++++++++++++++++++++------------------------
2 files changed, 41 insertions(+), 51 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java
index 6b9bbdc..ca92254 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java
@@ -438,41 +438,29 @@
@RequestMapping("/toClass")
@ResponseBody
public void toClass(@RequestBody ToClassDto toClassDto) throws ParseException {
-// System.out.println("===========到达getSelect=======" + toClassDto);
-// TCoursePackagePayment orinPay =
-// paymentService.getOne(new QueryWrapper<TCoursePackagePayment>().eq("id", toClassDto.getId()));
-// TCoursePackagePayment studentPay = paymentService.getOne
-// (new QueryWrapper<TCoursePackagePayment>()
-// .eq("studentId", toClassDto.getToStudentId())
-// .eq("coursePackageId", orinPay.getCoursePackageId()));
-
-
CoursePackageOrderStudent orinPay = orderStudentService.getById(toClassDto.getId());
-
- CoursePackageOrderStudent studentPay = orderStudentService.getOne(new QueryWrapper<CoursePackageOrderStudent>().eq("studentId", toClassDto.getToStudentId()).eq("coursePackageId", orinPay.getCoursePackageId()));
-
+ CoursePackageOrderStudent studentPay = orderStudentService.getOne(new QueryWrapper<CoursePackageOrderStudent>()
+ .eq("studentId", toClassDto.getToStudentId())
+ .eq("coursePackageId", orinPay.getCoursePackageId()));
TCoursePackage coursePackage = packageService.getById(orinPay.getCoursePackageId());
-
if (studentPay != null) {
//转移
- System.out.println("======orinPay=====>" + orinPay);
- System.out.println("======studentPay=====>" + studentPay);
Integer laveClassHours = orinPay.getLaveClassHours();
Integer totalClassHours = orinPay.getTotalClassHours();
- orinPay.setTotalClassHours(0);
+
+ CourseCounsum courseCounsum = new CourseCounsum();
+ courseCounsum.setInsertTime(new Date());
+ if (orinPay.getAppUserId().compareTo(studentPay.getAppUserId()) != 0) {
+ courseCounsum.setReason("课时赠送");
+ } else {
+ courseCounsum.setReason("课时转移");
+ }
+
orinPay.setLaveClassHours(0);
orinPay.setStatus(5);
orinPay.setAppUserId(null);
orderStudentService.updateById(orinPay);
-
- CourseCounsum courseCounsum = new CourseCounsum();
- courseCounsum.setInsertTime(new Date());
- if (orinPay.getAppUserId() != studentPay.getAppUserId()) {
- courseCounsum.setReason("课时赠送");
- } else {
- courseCounsum.setReason("课时转移");
- }
courseCounsum.setNum(laveClassHours);
courseCounsum.setChangeType(0);
courseCounsum.setPaymentId(orinPay.getId());
@@ -490,7 +478,7 @@
CourseCounsum courseCounsum1 = new CourseCounsum();
courseCounsum1.setInsertTime(new Date());
- if (orinPay.getAppUserId() != studentPay.getAppUserId()) {
+ if (orinPay.getAppUserId().compareTo(studentPay.getAppUserId()) != 0) {
courseCounsum1.setReason("课时赠送");
} else {
courseCounsum1.setReason("课时转移");
@@ -500,20 +488,26 @@
courseCounsum1.setPaymentId(studentPay.getId());
counsumService.save(courseCounsum1);
-
schedulingService.addNewCoursePackageScheduling(studentPay.getId(),laveClassHours);
-
-
+ //删除原排课数据
+ List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingService.selectList(new QueryWrapper<CoursePackageScheduling>()
+ .eq("type", 1).eq("appUserId", orinPay.getAppUserId())
+ .eq("studentId", orinPay.getStudentId()).eq("coursePackageId", orinPay.getCoursePackageId())
+ .orderByAsc("classDate"));
+ int num = totalClassHours - laveClassHours;
+ for (int i = num; i < coursePackageSchedulings.size(); i++) {
+ CoursePackageScheduling packageScheduling = coursePackageSchedulings.get(i);
+ coursePackageSchedulingService.deleteById(packageScheduling.getId());
+ coursePackageStudentService.remove(new QueryWrapper<CoursePackageStudent>().eq("coursePackageSchedulingId", packageScheduling.getId()));
+ }
} else {
-
-
-
-
+ Integer totalClassHours = orinPay.getTotalClassHours();
+ Integer laveClassHours = orinPay.getLaveClassHours();
Student student = studentClient.queryStudentById(toClassDto.getToStudentId());
CoursePackageOrderStudent to = new CoursePackageOrderStudent();
to.setStudentId(toClassDto.getToStudentId());
- to.setTotalClassHours(orinPay.getTotalClassHours());
- to.setLaveClassHours(orinPay.getLaveClassHours());
+ to.setTotalClassHours(totalClassHours);
+ to.setLaveClassHours(laveClassHours);
to.setCoursePackageId(orinPay.getCoursePackageId());
to.setState(1);
to.setAppUserId(student.getAppUserId());
@@ -529,14 +523,10 @@
orderStudentService.save(to);
- orinPay.setTotalClassHours(0);
orinPay.setLaveClassHours(0);
orinPay.setAppUserId(null);
orinPay.setStatus(6);
orderStudentService.updateById(orinPay);
-
-
-
CourseCounsum courseCounsum = new CourseCounsum();
@@ -556,17 +546,20 @@
courseCounsum1.setPaymentId(to.getId());
counsumService.save(courseCounsum);
-
-
- //开始排课
- addPackageStudent(coursePackage, to.getAppUserId(), to.getStudentId(), to);
-
-
-
-
+ //开始排课
+ addPackageStudent(coursePackage, to.getAppUserId(), to.getStudentId(), to);
+ //删除原排课数据
+ List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingService.selectList(new QueryWrapper<CoursePackageScheduling>()
+ .eq("type", 1).eq("appUserId", orinPay.getAppUserId())
+ .eq("studentId", orinPay.getStudentId()).eq("coursePackageId", orinPay.getCoursePackageId())
+ .orderByAsc("classDate"));
+ int num = totalClassHours - laveClassHours;
+ for (int i = num; i < coursePackageSchedulings.size(); i++) {
+ CoursePackageScheduling packageScheduling = coursePackageSchedulings.get(i);
+ coursePackageSchedulingService.deleteById(packageScheduling.getId());
+ coursePackageStudentService.remove(new QueryWrapper<CoursePackageStudent>().eq("coursePackageSchedulingId", packageScheduling.getId()));
+ }
}
-
-
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
index 6b15485..8586100 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
@@ -683,9 +683,6 @@
toClassDto.setId(id);
courseStuddentClient.toClass(toClassDto);
-
-// Map<String,List<SelectDto>> map = new HashMap<>();
-// map.put("options",selectDtos);
return new ResultUtil(0,0,"编辑成功",1,"");
}
--
Gitblit v1.7.1