Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -337,9 +337,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
             String courseScheduleName = subjectList.stream().map(subject -> subject.getName()).collect(Collectors.joining("/"));
 
-            while (highClassGroup.getCourseTimes() >= times) {
+            while (highClassGroup.getCourseTimes() > times) {
                 int dayOfWeek = now.getDayOfWeek().getValue();
-                if (highClassGroup.getDayOfWeek().equals(dayOfWeek)) {
+                if (highClassGroup.getDayOfWeek() == dayOfWeek) {
                     CourseSchedule courseSchedule = new CourseSchedule();
                     Instant instant = now.atZone(ZoneId.systemDefault()).toInstant();
                     Date classDate = Date.from(instant);
@@ -375,6 +375,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
             //加入Im群组
             addImGroup(highClassGroup, userIdList);
+
         }
         redisCache.releaseLocked(key, value);
         return highClassGroupList;
@@ -1680,9 +1681,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
             Calendar calendar = Calendar.getInstance();
             calendar.setTime(courseSchedule.getClassDate());
-            int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
-            highClassGroup.setDayOfWeek(dayOfWeek - 1);
-
+            Integer dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK)-1;
+            dayOfWeek =dayOfWeek.equals(0) ? 7 :dayOfWeek;
+            highClassGroup.setDayOfWeek(dayOfWeek);
         }
         return highClassGroupList;
     }

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

@@ -1172,8 +1172,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		courseScheduleService.batchDeleteMusicGroupCourseWithStudent(vipGroupId.toString(),studentId,GroupType.VIP);
 
-		classGroup.setStudentNum(classGroupStudentMapperDao.countClassGroupStudentNum(classGroup.getId()));
-		classGroupDao.update(classGroup);
+//		classGroup.setStudentNum(classGroupStudentMapperDao.countClassGroupStudentNum(classGroup.getId()));
+//		classGroupDao.update(classGroup);
 
 		//学员退出班级群
 		ImGroupMember[] imGroupMembers = new ImGroupMember[]{new ImGroupMember(studentId.toString())};
@@ -1257,10 +1257,10 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				classStudentMapperByUserIdAndClassGroupId.setStatus(ClassGroupStudentStatusEnum.QUIT);
 				classGroupStudentMapperDao.update(classStudentMapperByUserIdAndClassGroupId);
 
-				ClassGroup classGroup=new ClassGroup();
-				classGroup.setId(classStudentMapperByUserIdAndClassGroupId.getClassGroupId());
-				classGroup.setStudentNum(classGroupStudentMapperDao.countClassGroupStudentNum(classGroup.getId()));
-				classGroupDao.update(classGroup);
+//				ClassGroup classGroup=new ClassGroup();
+//				classGroup.setId(classStudentMapperByUserIdAndClassGroupId.getClassGroupId());
+//				classGroup.setStudentNum(classGroupStudentMapperDao.countClassGroupStudentNum(classGroup.getId()));
+//				classGroupDao.update(classGroup);
 
 				courseScheduleService.batchDeleteMusicGroupCourseWithStudent(studentPaymentOrder.getMusicGroupId(),studentApplyRefunds.getUserId(),GroupType.VIP);
 
@@ -1631,8 +1631,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		classGroupStudentMapperDao.classGroupStudentsInsert(classGroupStudentMappers);
 
-		classGroup.setStudentNum(classGroupStudentMapperDao.countClassGroupStudentNum(classGroup.getId()));
-		classGroupDao.update(classGroup);
+//		classGroup.setStudentNum(classGroupStudentMapperDao.countClassGroupStudentNum(classGroup.getId()));
+//		classGroupDao.update(classGroup);
 
 		try {
 			ImGroupMember[] imGroupMembers = imGroupMemberList.toArray(new ImGroupMember[imGroupMemberList.size()]);

mec-im/src/main/java/com/ym/controller/GroupController.java

@@ -2,6 +2,7 @@ package com.ym.controller;
 
 import com.ym.service.GroupService;
 import com.ym.service.MessageService;
+import io.rong.models.group.GroupMember;
 import io.rong.models.group.GroupModel;
 import io.rong.models.group.UserGroup;
 import io.rong.models.message.GroupMessage;
@@ -84,6 +85,8 @@ public class GroupController{
 
     @RequestMapping(value = "/dismiss", method = RequestMethod.POST)
     public Object dismiss(@RequestBody GroupModel groupModel) throws Exception {
+        GroupMember[] groupMember = {new GroupMember("1",null,null)};
+        groupModel.setMembers(groupMember);
         return groupService.groupDismiss(groupModel);
     }
 }