From 7aa9607492e2c0b70838c53083f5362e49e74f44 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 26 九月 2023 21:39:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java |   70 ++++++++++++++++++++++++++++------
 1 files changed, 57 insertions(+), 13 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
index d7a784b..b29cf19 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
@@ -231,6 +231,10 @@
 
 
         System.out.println("========couponIds=========>"+list4.get(0).getCouponIds());
+
+        model.addAttribute("cashPayment", list4.get(0).getCashPayment() == 0 ? false : true);
+        model.addAttribute("playPaiCoin", list4.get(0).getPlayPaiCoin() == 0 ? false : true);
+
         model.addAttribute("couponIds", list4.get(0).getCouponIds());
         model.addAttribute("coursePackagePaymentConfig", list4.remove(0));
         for (int i = 0; i < list4.size(); i++) {
@@ -239,13 +243,14 @@
 
         model.addAttribute("coursePackagePaymentConfigs", list4);
         model.addAttribute("index", 1);
+                if (list4.size()!=0) {
         CoursePackagePaymentConfig coursePackagePaymentConfig = list4.get(0);
-//        if (list4.size()!=0) {
+
             model.addAttribute("cashPayment", coursePackagePaymentConfig.getCashPayment() == 0 ? false : true);
             model.addAttribute("playPaiCoin", coursePackagePaymentConfig.getPlayPaiCoin() == 0 ? false : true);
             System.out.println("=========coursePackagePaymentConfig=============>" + coursePackagePaymentConfig);
 //        model.addAttribute("couponIds", "3,2");
-//        }
+        }
         return PREFIX + "coursePackage_edit.html";
     }
 
@@ -324,6 +329,10 @@
 
 
         System.out.println("========couponIds=========>"+list4.get(0).getCouponIds());
+
+        model.addAttribute("cashPayment", list4.get(0).getCashPayment() == 0 ? false : true);
+        model.addAttribute("playPaiCoin", list4.get(0).getPlayPaiCoin() == 0 ? false : true);
+
         model.addAttribute("couponIds", list4.get(0).getCouponIds());
         model.addAttribute("coursePackagePaymentConfig", list4.remove(0));
         for (int i = 0; i < list4.size(); i++) {
@@ -332,13 +341,14 @@
 
         model.addAttribute("coursePackagePaymentConfigs", list4);
         model.addAttribute("index", 1);
-        CoursePackagePaymentConfig coursePackagePaymentConfig = list4.get(0);
-//        if (list4.size()!=0) {
-        model.addAttribute("cashPayment", coursePackagePaymentConfig.getCashPayment() == 0 ? false : true);
-        model.addAttribute("playPaiCoin", coursePackagePaymentConfig.getPlayPaiCoin() == 0 ? false : true);
-        System.out.println("=========coursePackagePaymentConfig=============>" + coursePackagePaymentConfig);
+        if (list4.size()!=0) {
+            CoursePackagePaymentConfig coursePackagePaymentConfig = list4.get(0);
+
+            model.addAttribute("cashPayment", coursePackagePaymentConfig.getCashPayment() == 0 ? false : true);
+            model.addAttribute("playPaiCoin", coursePackagePaymentConfig.getPlayPaiCoin() == 0 ? false : true);
+            System.out.println("=========coursePackagePaymentConfig=============>" + coursePackagePaymentConfig);
 //        model.addAttribute("couponIds", "3,2");
-//        }
+        }
         return PREFIX + "coursePackage_info.html";
     }
 
@@ -460,7 +470,39 @@
         model.addAttribute("times", strings);
         model.addAttribute("counts", counts);
 
+
         return PREFIX + "classRecord.html";
+    }
+
+    /**
+     * 假期跳转到上课记录列表页
+     * @param model
+     * @param id
+     * @return
+     */
+    @GetMapping("/openClassRecord1")
+    public String openClassRecord1(Model model, Integer id){
+        TCoursePackage tCoursePackage = coursePackageClient.queryById(id);
+        String[] start = tCoursePackage.getClassStartTime().split(",");
+        String[] end = tCoursePackage.getClassEndTime().split(",");
+        Integer counts = packagePaymentClient.queryByClassId(id);
+
+
+        List<String> strings = new ArrayList<>();
+        for (int i = 0; i <start.length ; i++) {
+            String outTime = start[i] +"-" +end[0];
+            strings.add(outTime);
+        }
+
+        TStore store = storeService.getById(tCoursePackage.getStoreId());
+        Coach coach = coachClient.queryCoachById(tCoursePackage.getCoachId());
+        model.addAttribute("item", tCoursePackage);
+        model.addAttribute("store", store);
+        model.addAttribute("coach", coach);
+        model.addAttribute("times", strings);
+        model.addAttribute("counts", counts);
+
+        return PREFIX + "classRecord2.html";
     }
 
 
@@ -682,8 +724,9 @@
             String jsonString = jsonArray.getString(i);
             String[] split = jsonString.split(" - ");
             first.add(split[0]);
-            second.add(split[1]);
-
+            if (split.length>1) {
+                second.add(split[1]);
+            }
         }
         String firstString = String.join(",",first);
         String secondString = String.join(",",second);
@@ -928,13 +971,14 @@
 
     /**
      * 补课操作
-     * @param coursePackagePaymentId
+     * @param id
      * @return
      */
     @ResponseBody
     @PostMapping("/makeUpMissedLessons")
-    public ResultUtil makeUpMissedLessons(Long coursePackagePaymentId){
-        return coursePackageService.makeUpMissedLessons(coursePackagePaymentId);
+    public ResultUtil makeUpMissedLessons(Long id){
+        System.out.println("==========coursePackage补课PaymentId======"+id);
+        return coursePackageService.makeUpMissedLessons(id);
     }
 
 

--
Gitblit v1.7.1