From d643b843cc794d8f59c4ecd04bda2b9d35e5b22a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 28 十一月 2023 19:54:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java | 30 +++++++++++-------------------
1 files changed, 11 insertions(+), 19 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 ca92254..d0db8ce 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
@@ -450,7 +450,9 @@
CourseCounsum courseCounsum = new CourseCounsum();
courseCounsum.setInsertTime(new Date());
- if (orinPay.getAppUserId().compareTo(studentPay.getAppUserId()) != 0) {
+ Integer appUserId = orinPay.getAppUserId();
+ Integer appUserId1 = studentPay.getAppUserId();
+ if (appUserId.compareTo(appUserId1) != 0) {
courseCounsum.setReason("课时赠送");
} else {
courseCounsum.setReason("课时转移");
@@ -466,19 +468,9 @@
courseCounsum.setPaymentId(orinPay.getId());
counsumService.save(courseCounsum);
- Integer laveClassHours1 = studentPay.getLaveClassHours();
- Integer totalClassHours1 = studentPay.getTotalClassHours();
- int total = totalClassHours + totalClassHours1;
- int lave = laveClassHours + laveClassHours1;
-
- studentPay.setAppUserId(null);
- studentPay.setLaveClassHours(lave);
- studentPay.setTotalClassHours(total);
- orderStudentService.updateById(studentPay);
-
CourseCounsum courseCounsum1 = new CourseCounsum();
courseCounsum1.setInsertTime(new Date());
- if (orinPay.getAppUserId().compareTo(studentPay.getAppUserId()) != 0) {
+ if (appUserId.compareTo(appUserId1) != 0) {
courseCounsum1.setReason("课时赠送");
} else {
courseCounsum1.setReason("课时转移");
@@ -488,10 +480,10 @@
courseCounsum1.setPaymentId(studentPay.getId());
counsumService.save(courseCounsum1);
- schedulingService.addNewCoursePackageScheduling(studentPay.getId(),laveClassHours);
+ schedulingService.addNewCoursePackageScheduling(studentPay.getId(), laveClassHours);
//删除原排课数据
List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingService.selectList(new QueryWrapper<CoursePackageScheduling>()
- .eq("type", 1).eq("appUserId", orinPay.getAppUserId())
+ .eq("type", 1).eq("appUserId", appUserId)
.eq("studentId", orinPay.getStudentId()).eq("coursePackageId", orinPay.getCoursePackageId())
.orderByAsc("classDate"));
int num = totalClassHours - laveClassHours;
@@ -501,12 +493,13 @@
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(totalClassHours);
+ to.setTotalClassHours(laveClassHours);
to.setLaveClassHours(laveClassHours);
to.setCoursePackageId(orinPay.getCoursePackageId());
to.setState(1);
@@ -519,10 +512,9 @@
calendar.setTime(new Date());
calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + validDays);
to.setUseTime(calendar.getTime());
-
orderStudentService.save(to);
-
+ Integer appUserId = orinPay.getAppUserId();
orinPay.setLaveClassHours(0);
orinPay.setAppUserId(null);
orinPay.setStatus(6);
@@ -544,13 +536,13 @@
courseCounsum1.setNum(orinPay.getLaveClassHours());
courseCounsum1.setChangeType(1);
courseCounsum1.setPaymentId(to.getId());
- counsumService.save(courseCounsum);
+ counsumService.save(courseCounsum1);
//开始排课
addPackageStudent(coursePackage, to.getAppUserId(), to.getStudentId(), to);
//删除原排课数据
List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingService.selectList(new QueryWrapper<CoursePackageScheduling>()
- .eq("type", 1).eq("appUserId", orinPay.getAppUserId())
+ .eq("type", 1).eq("appUserId", appUserId)
.eq("studentId", orinPay.getStudentId()).eq("coursePackageId", orinPay.getCoursePackageId())
.orderByAsc("classDate"));
int num = totalClassHours - laveClassHours;
--
Gitblit v1.7.1