Forráskód Böngészése

1、课程调整时排除自动补签记录
2、删除请假时班级学生状态更新代码

Joburgess 5 éve
szülő
commit
acc05be19d

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

@@ -1858,27 +1858,27 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             classGroupService.batchIncreaseClassTimes(classGroupIds);
 
             //查询班级信息
-            List<ClassGroup> classGroupList = classGroupService.findClassGroupByIds(classGroupIds.stream().map(e -> e.toString()).collect(Collectors.joining(",")));
-
-            List<String> vipGroupIdList = new ArrayList<String>();
-            for (ClassGroup classGroup : classGroupList) {
-                if (classGroup.getGroupType() == GroupType.VIP && classGroup.getCurrentClassTimes() == classGroup.getTotalClassTimes().intValue()) {
-                    if (!vipGroupIdList.contains(classGroup.getMusicGroupId())) {
-                        vipGroupIdList.add(classGroup.getMusicGroupId());
-                    }
-                }
-            }
-            if (vipGroupIdList.size() > 0) {
-                List<VipGroup> vipGroupList = vipGroupDao.queryByIds(vipGroupIdList.stream().collect(Collectors.joining(",")));
-                for (VipGroup vipGroup : vipGroupList) {
-                    if (!vipGroup.getStatus().equals(VipGroupStatusEnum.PAUSE)
-                            && !vipGroup.getStatus().equals(VipGroupStatusEnum.CANCEL)) {
-                        vipGroup.setStatus(VipGroupStatusEnum.FINISHED);
-                    }
-                    vipGroup.setUpdateTime(date);
-                }
-                vipGroupDao.batchUpdate(vipGroupList);
-            }
+//            List<ClassGroup> classGroupList = classGroupService.findClassGroupByIds(classGroupIds.stream().map(e -> e.toString()).collect(Collectors.joining(",")));
+//
+//            List<String> vipGroupIdList = new ArrayList<String>();
+//            for (ClassGroup classGroup : classGroupList) {
+//                if (classGroup.getGroupType() == GroupType.VIP && classGroup.getCurrentClassTimes() == classGroup.getTotalClassTimes().intValue()) {
+//                    if (!vipGroupIdList.contains(classGroup.getMusicGroupId())) {
+//                        vipGroupIdList.add(classGroup.getMusicGroupId());
+//                    }
+//                }
+//            }
+//            if (vipGroupIdList.size() > 0) {
+//                List<VipGroup> vipGroupList = vipGroupDao.queryByIds(vipGroupIdList.stream().collect(Collectors.joining(",")));
+//                for (VipGroup vipGroup : vipGroupList) {
+//                    if (!vipGroup.getStatus().equals(VipGroupStatusEnum.PAUSE)
+//                            && !vipGroup.getStatus().equals(VipGroupStatusEnum.CANCEL)) {
+//                        vipGroup.setStatus(VipGroupStatusEnum.FINISHED);
+//                    }
+//                    vipGroup.setUpdateTime(date);
+//                }
+//                vipGroupDao.batchUpdate(vipGroupList);
+//            }
         }
 
         if (courseScheduleIdList.size() > 0) {

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleStudentPaymentServiceImpl.java

@@ -171,7 +171,7 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 						continue;
 					}
 					if(courseSchedule.getType().equals(CourseSchedule.CourseScheduleType.VIP)){
-
+						
 					}else{
 						CourseScheduleStudentPayment courseScheduleStudentPayment = new CourseScheduleStudentPayment(
 								courseSchedule.getId(),