update

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

@@ -2707,7 +2707,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			VipGroup vipGroup = vipGroupDao.get(vipGroupCourseAdjustInfo.getVipGroupId().longValue());
 
 			CourseSchedule courseSchedule = courseSchedules.stream().max(Comparator.comparing(CourseSchedule::getEndClassTime)).get();
-			if(courseSchedule.getEndClassTime().compareTo(vipGroup.getCoursesExpireDate())>0){
+			if(courseSchedule.getEndClassTime().compareTo(vipGroup.getCoursesExpireDate())>0&&!DateUtil.isSameDay(courseSchedule.getEndClassTime(),vipGroup.getCoursesExpireDate())){
 				throw new BizException("调整失败：课程时间超过课程有效期");
 			}
 

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupManageController.java

@@ -10,6 +10,7 @@ import com.ym.mec.biz.dal.dto.VipGroupApplyDto;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.entity.StudentApplyRefunds.StudentApplyRefundsStatus;
 import com.ym.mec.biz.dal.enums.AuditStatusEnum;
+import com.ym.mec.biz.dal.enums.VipGroupStatusEnum;
 import com.ym.mec.biz.dal.page.VipGroupAttendanceQueryInfo;
 import com.ym.mec.biz.dal.page.VipGroupQueryInfo;
 import com.ym.mec.biz.dal.page.VipGroupSalaryQueryInfo;
@@ -63,6 +64,23 @@ public class VipGroupManageController extends BaseController {
         return succeed();
     }
 
+    @ApiOperation(value = "vip修改")
+    @PostMapping("/update")
+    @PreAuthorize("@pcs.hasPermissions('vipGroupManage/update')")
+    public HttpResponseResult update(VipGroup vipGroup){
+        if(Objects.nonNull(vipGroup.getCoursesExpireDate())){
+            VipGroup oldVipGroup = vipGroupService.get(vipGroup.getId());
+            if(Objects.isNull(oldVipGroup)){
+                throw new BizException("此课程组不存在");
+            }
+            if(!VipGroupStatusEnum.PROGRESS.equals(oldVipGroup.getStatus())){
+                throw new BizException("此课程组状态暂不支持修改");
+            }
+        }
+        vipGroupService.update(vipGroup);
+        return succeed();
+    }
+
     @ApiOperation(value = "vip课申请")
     @PostMapping("/vipGroupApply")
     @PreAuthorize("@pcs.hasPermissions('vipGroupManage/vipGroupApply')")