From f8521034c5007b11bf00040e101bcf21195dfeb8 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 27 十一月 2023 16:49:04 +0800
Subject: [PATCH] 后台
---
cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java | 61 +++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 14 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java
index 4da42ab..54f63a2 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java
@@ -1,8 +1,7 @@
package com.dsh.course.controller;
-import com.dsh.course.entity.CancelledClasses;
-import com.dsh.course.entity.CoursePackageScheduling;
-import com.dsh.course.entity.TCoursePackagePayment;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.dsh.course.entity.*;
import com.dsh.course.feignclient.account.AppUserClient;
import com.dsh.course.feignclient.account.CoachClient;
import com.dsh.course.feignclient.account.StudentClient;
@@ -22,6 +21,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @author zhibing.pu
@@ -53,13 +53,13 @@
*/
@ResponseBody
@PostMapping("/cancelledClasses/listAll")
- public List<CancelClassesVO> listAll(@RequestBody CancelClassesQuery query){
+ public List<CancelClassesVO> listAll(@RequestBody CancelClassesQuery query) {
List<CancelClassesVO> res = new ArrayList<>();
- if (query.getStudentName()!=null){
- if (!query.getStudentName().equals("")){
+ if (query.getStudentName() != null) {
+ if (!query.getStudentName().equals("")) {
List<Integer> s = new ArrayList<>();
List<Student> students = studentClient.queryStudentListByName(query.getStudentName());
- if (students.size()==0){
+ if (students.size() == 0) {
return new ArrayList<>();
}
for (Student coach : students) {
@@ -68,11 +68,11 @@
query.setStudentIds(s);
}
}
- if (query.getCoachName()!=null){
- if (!query.getCoachName().equals("")){
+ if (query.getCoachName() != null) {
+ if (!query.getCoachName().equals("")) {
List<Integer> c = new ArrayList<>();
List<Coach> coaches = coachClient.queryCoachListByName(query.getCoachName());
- if (coaches.size()==0){
+ if (coaches.size() == 0) {
return new ArrayList<>();
}
for (Coach coach : coaches) {
@@ -81,10 +81,29 @@
query.setCoachIds(c);
}
}
-
- List<CancelClassesVO> result = cancelledClassesService.listAll(query);
+ List<Integer> collect = new ArrayList<>();
+ if (query.getStoreId() != null) {
+ List<TCoursePackage> list = coursePackageService.list(new LambdaQueryWrapper<TCoursePackage>().eq(TCoursePackage::getStoreId, query.getStoreId()));
+ collect = list.stream().map(TCoursePackage::getId).collect(Collectors.toList());
+ if (collect.size() == 0) {
+ collect.add(-1);
+ }
+ }
+ if (query.getStoreIds() != null && query.getStoreIds().size() != 0) {
+ List<TCoursePackage> list = coursePackageService
+ .list(new LambdaQueryWrapper<TCoursePackage>()
+ .in(TCoursePackage::getStoreId, query.getStoreIds()));
+ collect = list.stream().map(TCoursePackage::getId).collect(Collectors.toList());
+ if (collect.size() == 0) {
+ collect.add(-1);
+ }
+ }
+ List<CancelClassesVO> result = cancelledClassesService.listAll(query, collect);
for (CancelClassesVO cancelClassesVO : result) {
CoursePackageScheduling byId1 = coursePackageSchedulingService.getById(cancelClassesVO.getCoursePackageSchedulingId());
+ if (byId1 == null) {
+ continue;
+ }
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String string = format.format(byId1.getClassDate());
String string1 = format.format(byId1.getEndDate());
@@ -92,7 +111,7 @@
String minute = string1.substring(14, 16);
// 去除后三位
String s = string.substring(0, string.length() - 3);
- String temp = s+"-"+hour+":"+ minute;
+ String temp = s + "-" + hour + ":" + minute;
cancelClassesVO.setStartAndEnd(temp);
TCoursePackagePayment byId = coursePackagePaymentService.getById(cancelClassesVO.getCoursePackagePaymentId());
cancelClassesVO.setStoreName(storeClient.queryStoreById(cancelClassesVO.getStoreId()).getName());
@@ -103,14 +122,28 @@
return result;
}
+
+ @Autowired
+ private CourseCounsumService courseCounsumService;
+
/**
* 添加数据
+ *
* @param cancelledClasses
*/
@ResponseBody
@PostMapping("/cancelledClasses/addCancelledClasses")
- public void addCancelledClasses(@RequestBody CancelledClasses cancelledClasses){
+ public void addCancelledClasses(@RequestBody CancelledClasses cancelledClasses) {
cancelledClassesService.save(cancelledClasses);
+
+ TCoursePackagePayment byId = coursePackagePaymentService.getById(cancelledClasses.getCoursePackagePaymentId());
+ CourseCounsum courseCounsum = new CourseCounsum();
+ courseCounsum.setPaymentId(byId.getId());
+ courseCounsum.setChangeType(0);
+ courseCounsum.setNum(cancelledClasses.getCancelledClassesNumber());
+ courseCounsum.setInsertTime(new Date());
+ courseCounsum.setReason("消课");
+ courseCounsumService.save(courseCounsum);
}
}
--
Gitblit v1.7.1