Merge remote-tracking branch 'origin/master'

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

@@ -2786,6 +2786,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				teacherSalary=vipGroupCourseAdjustInfo.getTeachMode().equals(TeachModeEnum.OFFLINE)?salaryMap.get("offlineTeacherSalary"):salaryMap.get("onlineTeacherSalary");
 			}
 
+			if(courseSchedule.getEndClassTime().compareTo(vipGroup.getCoursesExpireDate())>0){
+				vipGroup.setCoursesExpireDate(courseSchedule.getEndClassTime());
+				vipGroupDao.update(vipGroup);
+			}
+
 			courseScheduleTeacherSalaryDao.batchUpdateCourseSalarys(courseScheduleIds, teacherSalary);
 
 		}
@@ -3256,6 +3261,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			}
 
 			if(Objects.nonNull(vipGroup) && newCourseSchedule.getStartClassTime().after(date)){
+				if(newCourseSchedule.getEndClassTime().compareTo(vipGroup.getCoursesExpireDate())>0){
+					vipGroup.setCoursesExpireDate(newCourseSchedule.getEndClassTime());
+				}
 				vipGroup.setStatus(VipGroupStatusEnum.PROGRESS);
 				vipGroup.setUpdateTime(date);
 				vipGroupDao.update(vipGroup);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -1926,6 +1926,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			days = (int) nowDate
 					.until((LocalDateTime.ofInstant(studentCourseInfoDto.getClassDate().toInstant(), DateUtil.zoneId).toLocalDate()), ChronoUnit.DAYS);
 		}
+        days += 1;
         int[] teachModeSequence=new int[userSurplusCourseInfoByGroup.size()];
         List<BigDecimal> coursePrices = new ArrayList<>();
         List<Long> courseScheduleIds=new ArrayList<>();
@@ -2074,11 +2075,11 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			}
 
 			if(Objects.nonNull(studentRecoverInfo.getExpireDate())){
-				CourseSchedule courseSchedule = newCourseSchedules.stream().max(Comparator.comparing(CourseSchedule::getClassDate)).get();
-				if(courseSchedule.getEndClassTime().compareTo(studentRecoverInfo.getExpireDate())>0&&!DateUtil.isSameDay(courseSchedule.getEndClassTime(), studentRecoverInfo.getExpireDate())){
-					throw new BizException("排课时间不可超过{}", DateUtil.dateToString(studentRecoverInfo.getExpireDate(), "yyyy年MM月dd日"));
+//				CourseSchedule courseSchedule = newCourseSchedules.stream().max(Comparator.comparing(CourseSchedule::getClassDate)).get();
+				if(vipGroup.getCoursesExpireDate().compareTo(studentRecoverInfo.getExpireDate())<=0||DateUtil.isSameDay(vipGroup.getCoursesExpireDate(), studentRecoverInfo.getExpireDate())){
+					throw new BizException("排课时间不可超过{}", DateUtil.dateToString(vipGroup.getCoursesExpireDate(), "yyyy年MM月dd日"));
 				}
-				vipGroup.setCoursesExpireDate(courseSchedule.getEndClassTime());
+//				vipGroup.setCoursesExpireDate(courseSchedule.getEndClassTime());
 			}
 
 			courseScheduleService.batchAddCourseSchedule(newCourseSchedules);

mec-biz/src/main/resources/config/mybatis/StudentManageDao.xml

@@ -181,7 +181,12 @@
                 AND s.operating_tag_ = #{operatingTag}
             </if>
             <if test="serviceTag != null">
-                AND s.service_tag_ = #{serviceTag}
+                <if test="serviceTag == 0">
+                    AND s.service_tag_ IN (0, 2)
+                </if>
+                <if test="serviceTag == 1">
+                    AND s.service_tag_ = 1
+                </if>
             </if>
             <if test="teacherId != null">
                 AND s.teacher_id_ = #{teacherId}