From 35fec86ca49916eb8a8082f7f1e99185ee1e3c24 Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期一, 25 九月 2023 18:02:17 +0800
Subject: [PATCH] 9.25

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java |   33 ++++++++++++++++++++++-----------
 1 files changed, 22 insertions(+), 11 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..9337926 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";
     }
 
@@ -928,13 +938,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("==========coursePackagePaymentId======"+id);
+        return coursePackageService.makeUpMissedLessons(id);
     }
 
 

--
Gitblit v1.7.1