From 640ff18d2d7f4be02ddb7f8f75e899f05545eb98 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 05 二月 2024 11:56:52 +0800
Subject: [PATCH] 更新bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java | 78 +++++++++++++++++++++-----------------
1 files changed, 43 insertions(+), 35 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java
index 05b26cf..045f9b7 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java
@@ -3,8 +3,11 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.course.entity.CoursePackageOrderStudent;
+import com.dsh.course.feignClient.account.StudentHonorClient;
+import com.dsh.course.feignClient.account.model.StudentHonor;
import com.dsh.course.feignClient.course.*;
import com.dsh.course.feignClient.course.model.*;
import com.dsh.guns.config.UserExt;
@@ -23,10 +26,8 @@
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* @author zhibing.pu
@@ -58,6 +59,9 @@
@Resource
private CancelledClassesClient cancelledClassesClient;
+
+ @Resource
+ private StudentHonorClient studentHonorClient;
@@ -548,33 +552,27 @@
*/
@Override
public ResultUtil cancellationRecord(Long id, String cancelClasses, Integer deductClassHour) {
-// CoursePackageScheduling coursePackageScheduling = coursePackageSchedulingClient.queryCoursePackageSchedulingById(id);
-
List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingClient.queryCoursePackageSchedulingsById(id);
+ CoursePackageScheduling coursePackageScheduling1 = coursePackageSchedulings.get(0);
+ Date classDate = coursePackageScheduling1.getEndDate();
+
+ if (new Date().before(classDate)){
+ return ResultUtil.error("课程未结束，无法消课");
+ }
List<Long> integers = new ArrayList<>();
for (CoursePackageScheduling coursePackageScheduling : coursePackageSchedulings) {
integers.add(coursePackageScheduling.getId());
coursePackageScheduling.setCancelClasses(cancelClasses);
coursePackageScheduling.setDeductClassHour(deductClassHour);
+ coursePackageScheduling.setStatus(3);
}
-
-
-// for (CoursePackageScheduling coursePackageScheduling : coursePackageSchedulings) {
-
-// if(coursePackageScheduling.getStatus() == 1 || coursePackageScheduling.getStatus() == 4){
-// return ResultUtil.error("不能添加消课凭证");
-// }
-// coursePackageScheduling.setCancelClasses(cancelClasses);
-// coursePackageScheduling.setDeductClassHour(deductClassHour);
coursePackageSchedulingClient.editCoursePackageScheduling(coursePackageSchedulings);
List<CoursePackageStudent> coursePackageStudents = coursePackageStudentClient.queryByCoursePackageSchedulingId(integers);
for (CoursePackageStudent coursePackageStudent : coursePackageStudents) {
- if(coursePackageStudent.getReservationStatus() == 0){
+ if(coursePackageStudent.getSignInOrNot() == 2){
continue;
}
-// TCoursePackagePayment tCoursePackagePayment = coursePackagePaymentClient.queryCoursePackagePaymentById(coursePackageStudent.getCoursePackagePaymentId());
-
CoursePackageOrderStudent coursePackageOrderStudent = coursePackagePaymentClient.queryCoursePackagePaymentById1(coursePackageStudent.getCoursePackagePaymentId());
if (deductClassHour!=null) {
@@ -599,17 +597,23 @@
cancelledClasses.setCoursePackageSchedulingId(coursePackageStudent.getCoursePackageSchedulingId());
cancelledClasses.setVoucher(cancelClasses);
if (deductClassHour!=null) {
- cancelledClasses.setCancelledClassesNumber(deductClassHour);}
+ cancelledClasses.setCancelledClassesNumber(deductClassHour);
+ }
cancelledClasses.setInsertTime(new Date());
cancelledClassesClient.addCancelledClasses(cancelledClasses);
-
-
-
-
-
+ //添加勋章数据
+ QueryCoursePackageStudent queryCoursePackageStudent = new QueryCoursePackageStudent();
+ queryCoursePackageStudent.setAppUserId(coursePackageStudent.getAppUserId());
+ queryCoursePackageStudent.setSignInOrNot(1);
+ queryCoursePackageStudent.setReservationStatus(1);
+ List<CoursePackageStudent> coursePackageStudents1 = coursePackageStudentClient.queryCoursePackageStudent(queryCoursePackageStudent);
+ StudentHonor studentHonor = new StudentHonor();
+ studentHonor.setAppUserId(coursePackageStudent.getAppUserId());
+ studentHonor.setHonorType(1);
+ studentHonor.setNumber(coursePackageStudents1.size());
+ studentHonorClient.saveStudentHonor(studentHonor);
}
-// }
return ResultUtil.success();
}
@@ -713,17 +717,21 @@
*/
@Override
public ResultUtil makeUpMissedLessons(Integer coursePackagePaymentId){
- ResultUtil resultUtil = coursePackagePaymentClient.consumeCourse(coursePackagePaymentId);
-// System.out.println("=========coursePackagePayment=====>"+coursePackagePayment);
-// if(coursePackagePayment.getStatus() == 2){
-// return ResultUtil.error("该学员已退课");
+// try {
+ Integer is = coursePackagePaymentClient.consumeCourse(coursePackagePaymentId);
+ if (is==1){
+ return ResultUtil.error("课时数不足");
+ }else {
+ return ResultUtil.success("补课成功");
+ }
+// return resultUtil;
+// return ResultUtil.success("补课成功");
+// }catch (Exception e){
+// return ResultUtil.success("课时数不足");
+//
// }
-// if(coursePackagePayment.getAbsencesNumber() == 0){
-// return ResultUtil.error("当前不需要补课");
-// }
-// coursePackagePayment.setAbsencesNumber(coursePackagePayment.getAbsencesNumber() - 1);
-// coursePackagePaymentClient.editCoursePackagePayment(coursePackagePayment);
- return resultUtil;
+
+// return resultUtil;
}
--
Gitblit v1.7.1