合并代码

puzhibing

2024-03-05 794a2ec5fa219a0a87be0c72bd59602cb9f6c6dc

 cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageOrderStudentServiceImpl.java

@@ -216,7 +216,7 @@
     * @return
     */
    @Override
    public boolean deductionClassHour(DeductionClassHourList deductionClassHourList) {
    public DeductionClassHourList deductionClassHour(DeductionClassHourList deductionClassHourList) {
        try {
            List<DeductionClassHour> list = deductionClassHourList.getDeductionClassHourList();
            for (DeductionClassHour deductionClassHour : list) {
@@ -251,6 +251,8 @@
                    List<CoursePackageScheduling> coursePackageSchedulings = packageSchedulings.subList(0, n);
                    List<Long> collect = coursePackageSchedulings.stream().map(CoursePackageScheduling::getId).collect(Collectors.toList());
                    coursePackageSchedulingService.removeByIds(collect);

                    deductionClassHour.setScheduledCourses(n);
                }

                this.updateById(coursePackageOrderStudent);
@@ -264,10 +266,30 @@
                courseCounsum.setAppUserId(coursePackageOrderStudent.getAppUserId());
                courseCounsumService.save(courseCounsum);
            }
            return true;
            return deductionClassHourList;
        }catch (Exception e){
            e.printStackTrace();
        }
        return false;
        return null;
    }


    /**
     * 回退课时和回退排课数据
     * @param deductionClassHourList
     */
    @Override
    public void backspaceClassHour(DeductionClassHourList deductionClassHourList) {
        List<DeductionClassHour> list = deductionClassHourList.getDeductionClassHourList();
        for (DeductionClassHour deductionClassHour : list) {
            CoursePackageOrderStudent coursePackageOrderStudent = this.getById(deductionClassHour.getId());
            Integer laveClassHours = coursePackageOrderStudent.getLaveClassHours();
            coursePackageOrderStudent.setLaveClassHours(coursePackageOrderStudent.getLaveClassHours() + deductionClassHour.getClassHour());
            //需要排课的节数
            Integer scheduledCourses = deductionClassHour.getScheduledCourses();
//            coursePackageService

        }

    }
}