From fabe5684d31e0c52548b33b7afbfec0855f9880e Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 30 十一月 2023 19:09:01 +0800
Subject: [PATCH] 11.30
---
cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 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 189628e..37dfdee 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
@@ -107,6 +107,21 @@
}
+
+
+ @ResponseBody
+ @PostMapping("/queryAble")
+ public Integer queryAble(@RequestBody Integer id) {
+
+ int coursePackageId = orderStudentService.count(new QueryWrapper<CoursePackageOrderStudent>().eq("coursePackageId", id));
+ if (coursePackageId>0){
+ return 1;
+ }else {
+ return 0;
+ }
+
+ }
+
//获取学员课时数信息
@RequestMapping("/getInfo")
@ResponseBody
@@ -126,6 +141,8 @@
studentClassInfo.setInDate(minDate);
System.out.println("===========>" + studentClassInfo);
+// appUserClient.queryGift(tStudentId);
+
return studentClassInfo;
}
@@ -136,7 +153,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;
@@ -287,7 +306,14 @@
@RequestMapping("/insertBack")
@ResponseBody
- public void insertBack(@RequestBody InsertBackDto insertBackDto) {
+ public Integer insertBack(@RequestBody InsertBackDto insertBackDto) {
+
+ List<MoneyBack> ids = moneyBackService.list(new QueryWrapper<MoneyBack>().eq("ids", insertBackDto.getIds()));
+
+ if (ids!=null){
+ return 1 ;
+ }
+
MoneyBack moneyBack = new MoneyBack();
moneyBack.setStudentId(insertBackDto.getId());
@@ -306,6 +332,7 @@
}
orderStudentService.updateBatchById(pays);
+ return 0;
}
@@ -513,7 +540,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);
@@ -524,7 +559,7 @@
CourseCounsum courseCounsum = new CourseCounsum();
courseCounsum.setInsertTime(new Date());
courseCounsum.setReason("赠课");
- courseCounsum.setNum(orinPay.getLaveClassHours());
+ courseCounsum.setNum(laveClassHours1);
courseCounsum.setChangeType(0);
courseCounsum.setPaymentId(orinPay.getId());
counsumService.save(courseCounsum);
@@ -533,7 +568,7 @@
CourseCounsum courseCounsum1 = new CourseCounsum();
courseCounsum1.setInsertTime(new Date());
courseCounsum1.setReason("赠课");
- courseCounsum1.setNum(orinPay.getLaveClassHours());
+ courseCounsum1.setNum(laveClassHours1);
courseCounsum1.setChangeType(1);
courseCounsum1.setPaymentId(to.getId());
counsumService.save(courseCounsum1);
@@ -591,7 +626,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