From 583ff2c3bfa45f6359a792c01f9bc3d37a6b2a0c Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期二, 26 九月 2023 18:55:08 +0800
Subject: [PATCH] 9.26。2

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 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 523ff41..f1247fe 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
@@ -462,16 +462,18 @@
             }
             TCoursePackagePayment tCoursePackagePayment = coursePackagePaymentClient.queryCoursePackagePaymentById(coursePackageStudent.getCoursePackagePaymentId());
 
-            if(tCoursePackagePayment.getLaveClassHours() - deductClassHour<0){
-                coursePackageStudentClient.editCoursePackageStudent(coursePackageStudent);
-                continue;
+            if (deductClassHour!=null) {
+                if (tCoursePackagePayment.getLaveClassHours() - deductClassHour < 0) {
+                    coursePackageStudentClient.editCoursePackageStudent(coursePackageStudent);
+                    continue;
+                }
+                tCoursePackagePayment.setLaveClassHours(tCoursePackagePayment.getLaveClassHours() - deductClassHour);
             }
-            tCoursePackagePayment.setLaveClassHours(tCoursePackagePayment.getLaveClassHours() - deductClassHour);
-
 
             if(coursePackageStudent.getSignInOrNot() == 0){
                 tCoursePackagePayment.setAbsencesNumber(tCoursePackagePayment.getAbsencesNumber() + 1);
             }
+            System.out.println("====tCoursePackagePayment====="+tCoursePackagePayment);
             coursePackagePaymentClient.editCoursePackagePayment(tCoursePackagePayment);
 
             CancelledClasses cancelledClasses = new CancelledClasses();
@@ -480,7 +482,8 @@
             cancelledClasses.setCoursePackagePaymentId(coursePackageStudent.getCoursePackagePaymentId());
             cancelledClasses.setCoursePackageSchedulingId(coursePackageStudent.getCoursePackageSchedulingId());
             cancelledClasses.setVoucher(cancelClasses);
-            cancelledClasses.setCancelledClassesNumber(deductClassHour);
+            if (deductClassHour!=null) {
+            cancelledClasses.setCancelledClassesNumber(deductClassHour);}
             cancelledClasses.setInsertTime(new Date());
             cancelledClassesClient.addCancelledClasses(cancelledClasses);
         }

--
Gitblit v1.7.1