更新

nickchange

2023-11-28 df2e94580f6a24a14d08b6535dc166625b2b2caa

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

@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.course.controller.CoursePackagePaymentController;
import com.dsh.course.entity.*;
import com.dsh.course.feignclient.account.StudentClient;
import com.dsh.course.feignclient.account.model.Student;
import com.dsh.course.mapper.CoursePackageSchedulingMapper;
import com.dsh.course.mapper.CoursePackageStudentMapper;
import com.dsh.course.model.QueryCoursePackageSchedulingList;
@@ -44,6 +46,9 @@

    @Resource
    private CoursePackageStudentMapper coursePackageStudentMapper;

    @Resource
    private StudentClient studentClient;


    /**
@@ -167,6 +172,8 @@
                    .orderByDesc("classDate")
                    .last(" limit 0, 1")
            );
            Student student = studentClient.queryStudentById(coursePackageScheduling.getStudentId());
            Date validity = student.getValidity();
            TCoursePackage coursePackage = coursePackageService.getById(coursePackageScheduling.getCoursePackageId());
            //上课星期
            String classWeeks = coursePackage.getClassWeeks();
@@ -216,7 +223,7 @@
                    continue;
                }
                //大于有效期不进行排课
                if (start.getTimeInMillis() >= useTime.getTime()) {
                if (start.getTimeInMillis() >= validity.getTime()) {
                    break;
                }
                for (int j = 0; j < split.length; j++) {
@@ -313,6 +320,8 @@
            TCoursePackage coursePackage = coursePackageService.getById(coursePackageOrderStudent.getCoursePackageId());
            Integer codeTime = coursePackage.getCodeTime();
            Integer laveClassHours = coursePackageOrderStudent.getLaveClassHours();
            Student student = studentClient.queryStudentById(coursePackageScheduling.getStudentId());
            Date validity = student.getValidity();

            Calendar calendar = Calendar.getInstance();
            calendar.setTime(new Date());
@@ -365,7 +374,7 @@
                    }

                    //大于有效期不进行排课
                    if (startTime.getTimeInMillis() >= useTime.getTime()) {
                    if (startTime.getTimeInMillis() >= validity.getTime()) {
                        break;
                    }
                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -479,7 +488,7 @@
                        }

                        //大于有效期不进行排课
                        if (startTime.getTimeInMillis() >= useTime.getTime()) {
                        if (startTime.getTimeInMillis() >= validity.getTime()) {
                            break;
                        }
                        for (int j = 0; j < split.length; j++) {
@@ -524,6 +533,13 @@
            coursePackageOrderStudent.setUseTime(useTime);
            coursePackageOrderStudent.setStatus(1);
            coursePackageOrderStudentService.updateById(coursePackageOrderStudent);
            Student student = studentClient.queryStudentById(coursePackageOrderStudent.getStudentId());
            if(null == student.getValidity()){
                student.setValidity(useTime);
            }else if(student.getValidity().getTime() < useTime.getTime()){
                student.setValidity(useTime);
            }
            studentClient.frozen(student);
        }catch (Exception e){
            e.printStackTrace();
        }