Merge remote-tracking branch 'origin/master'

mec-education/src/main/java/com/ym/mec/education/resp/StudentResp.java

@@ -46,6 +46,10 @@ public class StudentResp implements Serializable {
         private String musicGroupName;
         @ApiModelProperty(value = "乐团id", example = "1")
         private Integer musicGroupId;
+        @ApiModelProperty(value = "课程名称", example = "基础知识课")
+        private String courseName;
+        @ApiModelProperty(value = "班级名称", example = "长笛1班")
+        private String className;
         @ApiModelProperty(value = "课程日期", example = "9月19日")
         private String classDate;
         @ApiModelProperty(value = "课程星期", example = "星期一")
@@ -64,6 +68,8 @@ public class StudentResp implements Serializable {
         private String teachMode;
         @ApiModelProperty(value = "课程总数", example = "60分钟/次，共30节")
         private String totalClassTimes;
+        @ApiModelProperty(value = "剩余课时", example = "20")
+        private Integer remainderClassTimes;
         @ApiModelProperty(value = "上课学生")
         private List<String> studentList;
     }

mec-education/src/main/java/com/ym/mec/education/service/impl/CourseScheduleServiceImpl.java

@@ -62,6 +62,10 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleMapper,
     private ISchoolService schoolService;
     @Autowired
     private IMusicGroupStudentFeeService studentFeeService;
+    @Autowired
+    private IVipGroupClassGroupMapperService vipGroupClassGroupMapperService;
+    @Autowired
+    private IVipGroupService vipGroupService;
 
     @Override
     public PageResponse getPage(ClassGroupReq classGroupReq) {
@@ -218,7 +222,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleMapper,
     }
 
     /**
-     * 获取
+     * 获取课程计划
      *
      * @param courseScheduleList
      * @param classGroup
@@ -233,14 +237,6 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleMapper,
                 studentFeeQueryWrapper.lambda().eq(MusicGroupStudentFee::getMusicGroupId, classGroup.getMusicGroupId())
                     .eq(MusicGroupStudentFee::getUserId, studentReq.getStudentId());
                 MusicGroupStudentFee musicGroupStudentFee = studentFeeService.getOne(studentFeeQueryWrapper);
-                MusicGroup musicGroup = musicGroupService.getById(classGroup.getMusicGroupId());
-                Optional.ofNullable(musicGroup).ifPresent(musicGroupParam -> {
-                    studentCourseSchedule.setMusicGroupName(musicGroupParam.getName());
-                    studentCourseSchedule.setMusicGroupId(classGroup.getMusicGroupId());
-                    School school = schoolService.getById(musicGroup.getSchoolId());
-                    Optional.ofNullable(school).ifPresent(value -> studentCourseSchedule.
-                        setSchoolLongitudeLatitude(value.getLongitudeLatitude()));
-                });
                 Optional.ofNullable(courseSchedule.getClassDate()).ifPresent(classDate ->
                     studentCourseSchedule.setClassDate(DateUtil.date2String(courseSchedule.getClassDate()))
                         .setClassWeek(DateUtil.date2Week2(courseSchedule.getClassDate())));
@@ -250,23 +246,49 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleMapper,
                         .setTotalClassTimes(DateUtil.timeDifference(courseSchedule.getStartClassTime(), courseSchedule.getEndClassTime()) + "分钟/次,共" +
                             classGroup.getTotalClassTimes() + "节");
                 }
-                QueryWrapper<MusicGroupPaymentCalender> paymentCalenderQueryWrapper = new QueryWrapper<>();
-                paymentCalenderQueryWrapper.lambda().eq(MusicGroupPaymentCalender::getMusicGroupId, musicGroup.getId());
+
                 //乐团课(单技课，合奏课，综合课，小班)
                 if (CourseSchedule.CourseScheduleType.SINGLE.getCode().equals(courseSchedule.getType()) ||
                     CourseSchedule.CourseScheduleType.MIX.getCode().equals(courseSchedule.getType()) ||
                     CourseSchedule.CourseScheduleType.COMPREHENSIVE.getCode().equals(courseSchedule.getType()) ||
                     CourseSchedule.CourseScheduleType.HIGH.getCode().equals(courseSchedule.getType())) {
+                    MusicGroup musicGroup = musicGroupService.getById(classGroup.getMusicGroupId());
+                    Optional.ofNullable(musicGroup).ifPresent(musicGroupParam -> {
+                        studentCourseSchedule.setMusicGroupName(musicGroupParam.getName());
+                        studentCourseSchedule.setMusicGroupId(classGroup.getMusicGroupId());
+                        School school = schoolService.getById(musicGroup.getSchoolId());
+                        Optional.ofNullable(school).ifPresent(value -> studentCourseSchedule.
+                            setSchoolLongitudeLatitude(value.getLongitudeLatitude()));
+                    });
+                    QueryWrapper<MusicGroupPaymentCalender> paymentCalenderQueryWrapper = new QueryWrapper<>();
+                    paymentCalenderQueryWrapper.lambda().eq(MusicGroupPaymentCalender::getMusicGroupId, musicGroup.getId());
                     studentCourseSchedule.setCourseType(1);
                     //续费状态
                     if (Objects.nonNull(musicGroupStudentFee)) {
                         studentCourseSchedule.setRenewStatus("已缴费");
                     }
                 } else if (CourseSchedule.CourseScheduleType.VIP.getCode().equals(courseSchedule.getType())) {
+                    //VIP
+                    studentCourseSchedule.setCourseName(courseSchedule.getName()).setClassName(classGroup.getName());
+                    if (Objects.nonNull(classGroup.getTotalClassTimes()) && Objects.nonNull(classGroup.getCurrentClassTimes())) {
+                        studentCourseSchedule.setRemainderClassTimes(classGroup.getTotalClassTimes() - classGroup.getCurrentClassTimes());
+                    }
+                    QueryWrapper<VipGroupClassGroupMapper> vipGroupClassGroupMapperQueryWrapper = new QueryWrapper<>();
+                    vipGroupClassGroupMapperQueryWrapper.lambda().eq(VipGroupClassGroupMapper::getClassGroupId, courseSchedule.getClassGroupId());
+                    VipGroupClassGroupMapper vipGroupClassGroupMapper = vipGroupClassGroupMapperService.getOne(vipGroupClassGroupMapperQueryWrapper);
+                    if (Objects.nonNull(vipGroupClassGroupMapper)) {
+                        VipGroup vipGroup = vipGroupService.getById(vipGroupClassGroupMapper.getVipGroupId());
+                        Optional.ofNullable(vipGroup).ifPresent(vipGroupParam -> {
+                            studentCourseSchedule.setMusicGroupId(classGroup.getMusicGroupId());
+                            School school = schoolService.getById(vipGroupParam.getTeacherSchoolId());
+                            Optional.ofNullable(school).ifPresent(value -> studentCourseSchedule.
+                                setSchoolLongitudeLatitude(value.getLongitudeLatitude()));
+                        });
+                    }
                     studentCourseSchedule.setCourseType(2);
-                    if (Objects.isNull(musicGroupStudentFee.getNextPaymentDate())){
+                    if (Objects.isNull(musicGroupStudentFee.getNextPaymentDate())) {
                         studentCourseSchedule.setRenewStatus("未续费");
-                    }else {
+                    } else {
                         studentCourseSchedule.setRenewStatus("已续费");
                     }
                     SysUser teacher = sysUserService.getById(courseSchedule.getTeacherId());
@@ -300,29 +322,29 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleMapper,
     public BaseResponse courseInfo(CourseScheduleReq courseScheduleReq) {
 
 
-        if(courseScheduleReq.getCourseScheduleId() == null){
+        if (courseScheduleReq.getCourseScheduleId() == null) {
             return BaseResponse.failParams();
         }
         CourseInfoResp resp = new CourseInfoResp();
         CourseSchedule courseSchedule = this.baseMapper.selectById(courseScheduleReq.getCourseScheduleId());
-        if(courseSchedule != null){
+        if (courseSchedule != null) {
             resp.setCourseName(courseSchedule.getName());
-            resp.setClassDate(DateUtil.date2String(courseSchedule.getClassDate(),DateUtil.DATE_FORMAT));
+            resp.setClassDate(DateUtil.date2String(courseSchedule.getClassDate(), DateUtil.DATE_FORMAT));
             resp.setCourseScheduleId(courseSchedule.getId());
-            resp.setStartClassTime(DateUtil.date2String(courseSchedule.getStartClassTime(),DateUtil.TIME_FORMAT));
-            resp.setEndClassTime(DateUtil.date2String(courseSchedule.getEndClassTime(),DateUtil.TIME_FORMAT));
+            resp.setStartClassTime(DateUtil.date2String(courseSchedule.getStartClassTime(), DateUtil.TIME_FORMAT));
+            resp.setEndClassTime(DateUtil.date2String(courseSchedule.getEndClassTime(), DateUtil.TIME_FORMAT));
             resp.setWeek(DateUtil.date2Week(courseSchedule.getClassDate()));
 
             SysUser sysUser = sysUserService.getById(courseSchedule.getTeacherId());
-            if(sysUser != null){
+            if (sysUser != null) {
                 resp.setRealName(sysUser.getRealName());
             }
             ClassGroup classGroup = groupService.getById(courseSchedule.getClassGroupId());
-            if(classGroup != null){
+            if (classGroup != null) {
                 MusicGroup musicGroup = musicGroupService.getById(courseSchedule.getClassGroupId());
-                if(musicGroup != null && musicGroup.getSchoolId()!= null){
+                if (musicGroup != null && musicGroup.getSchoolId() != null) {
                     School school = schoolService.getById(musicGroup.getSchoolId());
-                    if(school != null){
+                    if (school != null) {
                         resp.setSchoolName(school.getName());
                     }
                 }