From a1e80d905fd38f6ead484396b788fe19b0a3d7d5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 十二月 2023 09:16:13 +0800
Subject: [PATCH] 修改bug

---
 cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
index 822cac7..9c618e6 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -180,6 +180,7 @@
         coursePackageOrder.setStudentIds(String.valueOf(packagePayment.getStudentId()));
         coursePackageOrder.setCoursePackageId(packagePayment.getCoursePackageId());
         coursePackageOrder.setClassHours(packagePayment.getClassHours());
+        coursePackageOrder.setLaveClassHours(packagePayment.getClassHours());
         coursePackageOrder.setOriginalPrice(packagePayment.getOriginalPrice());
         coursePackageOrder.setCashPayment(packagePayment.getCashPayment());
         coursePackageOrder.setPlayPaiCoin(packagePayment.getPlayPaiCoin());
@@ -246,7 +247,7 @@
                 coursePackageOrderStudentService.saveOrUpdate(coursePackageOrderStudent);
                 Integer studentId = Integer.valueOf(byId1.getStudentIds());
                 //开始排课
-                addPackageStudent1(byId, byId1.getAppUserId(), studentId, coursePackageOrderStudent);
+                addPackageStudent1(byId, byId1.getAppUserId(), studentId, byId1, coursePackageOrderStudent);
             } else {
                 Date useTime = coursePackageOrderStudent.getUseTime();
                 coursePackageOrderStudent.setTotalClassHours(coursePackageOrderStudent.getTotalClassHours() + byId1.getClassHours());
@@ -279,12 +280,12 @@
                 Integer studentId = Integer.valueOf(byId1.getStudentIds());
                 //中间断课，没有连续续费的情况需要重新排课
                 if (useTime.compareTo(new Date()) < 0) {
-                    addPackageStudent1(byId, byId1.getAppUserId(), studentId, coursePackageOrderStudent);
+                    addPackageStudent1(byId, byId1.getAppUserId(), studentId, byId1, coursePackageOrderStudent);
                 }
             }
         }
             if(byId.getType() == 2){
-                addPackageStudent1(byId, byId1.getAppUserId(), Integer.valueOf(byId1.getStudentIds()), null);
+                addPackageStudent1(byId, byId1.getAppUserId(), Integer.valueOf(byId1.getStudentIds()), byId1, null);
             }
         return packagePaymentService.changeState(dto);
     }
@@ -1728,7 +1729,7 @@
                 if (student != null) {
                     sId = student.getId();
                 }
-                addPackageStudent(orderDto.getClassId(), orderDto.getAppUserId(), Integer.valueOf(s), coursePackagePayment.getId());
+                addPackageStudent(orderDto.getClassId(), orderDto.getAppUserId(), Integer.valueOf(s), coursePackagePayment, coursePackagePayment.getId());
 
 
                 CourseCounsum courseCounsum = new CourseCounsum();
@@ -1751,7 +1752,7 @@
                 if (student != null) {
                     sId = student.getId();
                 }
-                addPackageStudent(orderDto.getClassId(), orderDto.getAppUserId(), Integer.valueOf(s), coursePackagePaymentServiceOne.getId());
+                addPackageStudent(orderDto.getClassId(), orderDto.getAppUserId(), Integer.valueOf(s), coursePackagePaymentServiceOne, coursePackagePaymentServiceOne.getId());
 
 
                 CourseCounsum courseCounsum = new CourseCounsum();
@@ -1901,7 +1902,8 @@
 
     @Autowired
     private TCoursePackageService coursePackageService;
-    private void addPackageStudent1(TCoursePackage tCoursePackage, Integer userId, Integer sId, CoursePackageOrderStudent coursePackageOrderStudent) {
+
+    private void addPackageStudent1(TCoursePackage tCoursePackage, Integer userId, Integer sId, CoursePackageOrder coursePackageOrder, CoursePackageOrderStudent coursePackageOrderStudent) {
         try {
             //1常规 2假期 3体验
             if (tCoursePackage.getType() == 1) {
@@ -1958,6 +1960,7 @@
                         coursePackageScheduling.setAppUserId(userId);
                         coursePackageScheduling.setStudentId(sId);
                         coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
+                        coursePackageScheduling.setCoursePackagePaymentIds(coursePackageOrder.getId().toString());
                         Date parse = format1.parse(format.format(time) + " " + split[j]);
                         Date parse1 = format1.parse(format.format(time) + " " + split1[j]);
                         coursePackageScheduling.setClassDate(parse);
@@ -2018,6 +2021,7 @@
                         coursePackageScheduling.setAppUserId(userId);
                         coursePackageScheduling.setStudentId(sId);
                         coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
+                        coursePackageScheduling.setCoursePackagePaymentIds(coursePackageOrder.getId().toString());
                         Date parse = format1.parse(format.format(time) + " " + split[j]);
                         Date parse1 = format1.parse(format.format(time) + " " + split1[j]);
                         coursePackageScheduling.setClassDate(parse);
@@ -2043,7 +2047,7 @@
             e.printStackTrace();
         }
     }
-    private void addPackageStudent(Integer courseId, Integer userId, Integer sId, Long paymentId) throws ParseException {
+    private void addPackageStudent(Integer courseId, Integer userId, Integer sId, TCoursePackagePayment coursePackagePayment, Long paymentId) throws ParseException {
         // 课包
         TCoursePackage tCoursePackage = coursePackageService.getById(courseId);
 
@@ -2094,6 +2098,7 @@
                         }
                         CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
                         coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
+                        coursePackageScheduling.setCoursePackagePaymentIds(coursePackagePayment.getId().toString());
                         Date parse = format1.parse(format.format(date) + " " + split[i1]);
                         Date parse1 = format1.parse(format.format(date) + " " + split1[i1]);
                         coursePackageScheduling.setClassDate(parse);
@@ -2157,6 +2162,7 @@
                         }
                         CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
                         coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
+                        coursePackageScheduling.setCoursePackagePaymentIds(coursePackagePayment.getId().toString());
                         Date parse = format1.parse(format.format(date) + " " + split[i1]);
                         Date parse1 = format1.parse(format.format(date) + " " + split1[i1]);
                         coursePackageScheduling.setClassDate(parse);
@@ -2269,6 +2275,7 @@
                     }
                     CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
                     coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
+                    coursePackageScheduling.setCoursePackagePaymentIds(pay.getId().toString());
                     Date parse = format1.parse(format.format(date) + " " + split[i1]);
                     Date parse1 = format1.parse(format.format(date) + " " + split1[i1]);
                     coursePackageScheduling.setClassDate(parse);

--
Gitblit v1.7.1