From d4fbea2ac7f7c98ffd83480f8f2535ca92f3baea Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 29 十一月 2023 18:19:43 +0800
Subject: [PATCH] 11.29
---
cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 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 d0db8ce..edb5504 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
@@ -136,7 +136,9 @@
System.out.println("==========getClassList===tStudentId====" + tStudentId);
List<ClassListDto> listDtos = studentService.getClassList(tStudentId);
for (ClassListDto dto : listDtos) {
- dto.setHasClassHours(dto.getTotalClassHours() - dto.getLaveClassHours());
+ if (dto.getClassType()!=2) {
+ dto.setHasClassHours(dto.getTotalClassHours() - dto.getLaveClassHours());
+ }
}
System.out.println("======listDtos======" + listDtos);
return listDtos;
@@ -453,7 +455,7 @@
Integer appUserId = orinPay.getAppUserId();
Integer appUserId1 = studentPay.getAppUserId();
if (appUserId.compareTo(appUserId1) != 0) {
- courseCounsum.setReason("课时赠送");
+ courseCounsum.setReason("赠课");
} else {
courseCounsum.setReason("课时转移");
}
@@ -471,7 +473,7 @@
CourseCounsum courseCounsum1 = new CourseCounsum();
courseCounsum1.setInsertTime(new Date());
if (appUserId.compareTo(appUserId1) != 0) {
- courseCounsum1.setReason("课时赠送");
+ courseCounsum1.setReason("赠课");
} else {
courseCounsum1.setReason("课时转移");
}
@@ -513,7 +515,15 @@
calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + validDays);
to.setUseTime(calendar.getTime());
orderStudentService.save(to);
+ if(null == student.getValidity()){
+ student.setValidity(calendar.getTime());
+ }else if(student.getValidity().getTime() < calendar.getTime().getTime()){
+ student.setValidity(calendar.getTime());
+ }
+ studentClient.frozen(student);
+
+ Integer laveClassHours1 = orinPay.getLaveClassHours();
Integer appUserId = orinPay.getAppUserId();
orinPay.setLaveClassHours(0);
orinPay.setAppUserId(null);
@@ -523,8 +533,8 @@
CourseCounsum courseCounsum = new CourseCounsum();
courseCounsum.setInsertTime(new Date());
- courseCounsum.setReason("课时赠送");
- courseCounsum.setNum(orinPay.getLaveClassHours());
+ courseCounsum.setReason("赠课");
+ courseCounsum.setNum(laveClassHours1);
courseCounsum.setChangeType(0);
courseCounsum.setPaymentId(orinPay.getId());
counsumService.save(courseCounsum);
@@ -532,8 +542,8 @@
CourseCounsum courseCounsum1 = new CourseCounsum();
courseCounsum1.setInsertTime(new Date());
- courseCounsum1.setReason("课时赠送");
- courseCounsum1.setNum(orinPay.getLaveClassHours());
+ courseCounsum1.setReason("赠课");
+ courseCounsum1.setNum(laveClassHours1);
courseCounsum1.setChangeType(1);
courseCounsum1.setPaymentId(to.getId());
counsumService.save(courseCounsum1);
@@ -591,7 +601,9 @@
int day_week = calendar.get(Calendar.DAY_OF_WEEK);
day_week = day_week - 1 == 0 ? 7 : day_week - 1;
int num = 8 - day_week + 7;
- Date useTime = coursePackageOrderStudent.getUseTime();
+
+ Student student = studentClient.queryStudentById(coursePackageOrderStudent.getStudentId());
+ Date useTime = student.getValidity();
for (int i = 0; i < num; i++) {
Date time = calendar.getTime();
--
Gitblit v1.7.1