Merge remote-tracking branch 'origin/master'

puzhibing

2024-01-03 168d852672f8f671a01d6f0f053349d0d321ec7c

 cloud-server-course/src/main/java/com/dsh/course/controller/CourseRecordController.java

@@ -41,22 +41,20 @@
    private CancelledClassesService caccService;



    @PostMapping("/base/courseRecord/queryDeduClassHours")
    public Integer getDeductionClassHour(@RequestBody GetStudentCourse course){
    public Integer getDeductionClassHour(@RequestBody GetStudentCourse course) {
        Integer sult = 0;
        TCoursePackage coursePackage = tcpService.getById(course.getCourseId());
        if (null != coursePackage && coursePackage.getStatus() == 3){
        if (null != coursePackage && coursePackage.getStatus() == 3) {
            List<CoursePackageStudent> coursePackageStudents = cosService.list(new QueryWrapper<CoursePackageStudent>()
                    .eq("coursePackageId",course.getCourseId() )
                    .eq("studentId",course.getStuId() )
                    .eq("coursePackageId", course.getCourseId())
                    .eq("studentId", course.getStuId())
                    .eq("appUserId", course.getAppUserId())
                    .eq("signInOrNot",1));

            if (coursePackageStudents.size() > 0){
                    .eq("signInOrNot", 1));
            if (coursePackageStudents.size() > 0) {
                List<CancelledClasses> list = caccService.list(new QueryWrapper<CancelledClasses>()
                        .eq("coursePackageId",course.getCourseId() ));
                if (list.size() > 0){
                        .eq("coursePackageId", course.getCourseId()));
                if (list.size() > 0) {
                    for (CancelledClasses cancelledClasses : list) {
                        sult = sult + cancelledClasses.getCancelledClassesNumber();
                    }
@@ -65,7 +63,6 @@
        }
        return sult;
    }

    @Autowired
    private CourseCounsumService courseCounsumService;

@@ -74,18 +71,16 @@
        courseCounsumService.save(courseCounsum);
    }


    @PostMapping("/base/courseRecord/cancelCourseData")
    public Integer cancelCourseRecordClass(@RequestBody Integer courseRecordId){
    public Integer cancelCourseRecordClass(@RequestBody Integer courseRecordId) {
        int sult = 0;
        CoursePackageStudent packageStudent = cosService.getById(courseRecordId);
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy.MM.dd");
        SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm");
        String tis = simpleDateFormat.format(new Date());

        if (ToolUtil.isNotEmpty(packageStudent)){
        if (ToolUtil.isNotEmpty(packageStudent)) {
            TCoursePackage coursePackage = tcpService.getById(packageStudent.getCoursePackageId());
            String startTime = tis +" " + coursePackage.getClassStartTime();
            String startTime = tis + " " + coursePackage.getClassStartTime();
            Date parse = null;
            try {
                parse = format.parse(startTime);
@@ -96,9 +91,9 @@
            // 计算时间间隔
            long hours = ChronoUnit.HOURS.between(LocalDateTime.now(), localDateTime);
            // 判断是否在前三小时内
            if (hours <= 3 && hours >= 0){
            if (hours <= 3 && hours >= 0) {
                sult = 1;
            }else {
            } else {
                sult = 2;
            }
        }