1、教务端课程交换

2、vip课退课费用及相关逻辑调整
3、补签到、签退

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

@@ -749,6 +749,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 					.sorted(Comparator.comparing(CourseSchedule::getStartClassTime))
 					.collect(Collectors.toList());
 			vipGroupDetail.setCourseSchedules(collect);
+			vipGroupDetail.setTotalClassTimes(collect.size());
 		}
 
         vipGroupDetail.setNumberOfClasses(vipGroupDao.countTeacherVipGroups(vipGroupDetail.getTeacherId().longValue()));
@@ -2167,8 +2168,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			throw new BizException("班级不存在");
 		}
 
-		if(!vipGroup.getStatus().equals(VipGroupStatusEnum.PROGRESS)
-			&&!vipGroup.getStatus().equals(VipGroupStatusEnum.APPLYING_END)){
+		if(!vipGroup.getStatus().equals(VipGroupStatusEnum.PROGRESS)){
 			throw new BizException("此状态的vip课程不支持加课");
 		}
 
@@ -2618,11 +2618,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 					} else if (vipGroup.getRegistrationStartTime().before(now) && vipGroup.getPaymentExpireDate().after(now)) {
 						vipGroup.setStatus(VipGroupStatusEnum.APPLYING);
 					}
-					if (vipGroup.getPaymentExpireDate().before(now) && vipGroup.getCourseStartDate().after(now)) {
-						vipGroup.setStatus(VipGroupStatusEnum.APPLYING_END);
-					} else if (vipGroup.getCourseStartDate().before(now) && vipGroup.getCoursesExpireDate().after(now)) {
-						vipGroup.setStatus(VipGroupStatusEnum.PROGRESS);
-					}
 					VipGroup vipGroup1 = new VipGroup();
 					vipGroup1.setId(vipGroup.getId());
 					vipGroup1.setStatus(vipGroup.getStatus());

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

@@ -90,9 +90,7 @@
             <if test="courseScheduleId != null">
                 course_schedule_id_ = #{courseScheduleId},
             </if>
-            <if test="updateTime != null">
-                update_time_ = NOW(),
-            </if>
+            update_time_ = NOW(),
             <if test="score != null">
                 score_ = #{score},
             </if>