From 53e7558400dcacecdce70e39ebfe1727740f9296 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 25 十一月 2023 17:20:06 +0800
Subject: [PATCH] 重写课包支付和排课逻辑

---
 cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java |   36 +++++++++++++++++++-----------------
 1 files changed, 19 insertions(+), 17 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 d3082bc..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
@@ -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,27 +81,27 @@
                 query.setCoachIds(c);
             }
         }
-        List<Integer> collect =new ArrayList<>();
-        if(query.getStoreId()!=null){
+        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 = list.stream().map(TCoursePackage::getId).collect(Collectors.toList());
+            if (collect.size() == 0) {
                 collect.add(-1);
             }
         }
-        if(query.getStoreIds()!=null && query.getStoreIds().size()!=0){
+        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){
+            if (collect.size() == 0) {
                 collect.add(-1);
             }
         }
-        List<CancelClassesVO> result = cancelledClassesService.listAll(query,collect);
+        List<CancelClassesVO> result = cancelledClassesService.listAll(query, collect);
         for (CancelClassesVO cancelClassesVO : result) {
             CoursePackageScheduling byId1 = coursePackageSchedulingService.getById(cancelClassesVO.getCoursePackageSchedulingId());
-            if (byId1==null){
+            if (byId1 == null) {
                 continue;
             }
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -111,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());
@@ -125,13 +125,15 @@
 
     @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());

--
Gitblit v1.7.1