Merge branch 'active_course_2021-09-26～29' of http://git.dayaedu.com/yonge/mec into 2021-double-eleven

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

@@ -327,9 +327,9 @@ public class GroupClassServiceImpl implements GroupClassService {
                 cloudTeacherOrder.setRemark("退还活动关联会员时长");
                 cloudTeacherOrderDao.update(cloudTeacherOrder);
             }
-            if(activityUserMapper.getGiveVipFlag() == 2 || activityUserMapper.getVipFlag() == 2){
+            if((masterGroup && activityUserMapper.getGiveVipFlag() == 2) || (!masterGroup && activityUserMapper.getVipFlag() == 2)){
                 Long giveVipGroupId = activityUserMapper.getGiveVipGroupId();
-                if(activityUserMapper.getVipFlag() == 2){
+                if(!masterGroup){
                     giveVipGroupId = activityUserMapper.getVipGroupId();
                 }
                 VipGroup giveVipGroup = vipGroupDao.get(giveVipGroupId);
@@ -373,9 +373,9 @@ public class GroupClassServiceImpl implements GroupClassService {
                 //学员退出班级群
                 imGroupMemberService.quit(giveClassGroup.getId().longValue(), studentId);
             }
-            if(activityUserMapper.getGivePracticeFlag() == 2 || activityUserMapper.getPracticeFlag() == 2){
+            if((masterGroup && activityUserMapper.getGivePracticeFlag() == 2) || (!masterGroup && activityUserMapper.getPracticeFlag() == 2)){
                 Long givePracticeGroupId = activityUserMapper.getGivePracticeGroupId();
-                if(activityUserMapper.getPracticeFlag() == 2){
+                if(!masterGroup){
                     givePracticeGroupId = activityUserMapper.getPracticeGroupId();
                 }
                 PracticeGroup practiceGroup = practiceGroupService.get(givePracticeGroupId);

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

@@ -3474,22 +3474,26 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		//是否关联活动
 		if(vipGroup.getVipGroupActivityId() != null){
 			ActivityUserMapper activityUserMapper = activityUserMapperService.findByStudentId(vipGroupId, studentId);
-			if(Objects.nonNull(activityUserMapper.getVipGroupId())){
-				VipGroup group = vipGroupDao.get(activityUserMapper.getVipGroupId());
-				vipGroupCategory = vipGroupCategoryDao.get(group.getVipGroupCategoryId().intValue());
-				userCourseInfos.addAll(courseScheduleDao.findUserCourseInfos(GroupType.VIP, activityUserMapper.getVipGroupId().toString(), studentId, null));
-			}
-			if(Objects.nonNull(activityUserMapper.getGiveVipGroupId())){
-				userCourseInfos.addAll(courseScheduleDao.findUserCourseInfos(GroupType.VIP, activityUserMapper.getGiveVipGroupId().toString(), studentId, null));
-			}
-			if(Objects.nonNull(activityUserMapper.getPracticeGroupId())){
-				vipGroupCategory = vipGroupCategoryDao.get(1);
-				userCourseInfos.addAll(courseScheduleDao.findUserCourseInfos(GroupType.PRACTICE, activityUserMapper.getPracticeGroupId().toString(), studentId, null));
-			}
-			if(Objects.nonNull(activityUserMapper.getGivePracticeGroupId())){
-				userCourseInfos.addAll(courseScheduleDao.findUserCourseInfos(GroupType.PRACTICE, activityUserMapper.getGivePracticeGroupId().toString(), studentId, null));
+			if(activityUserMapper != null){
+				if(Objects.nonNull(activityUserMapper.getVipGroupId())){
+					VipGroup group = vipGroupDao.get(activityUserMapper.getVipGroupId());
+					vipGroupCategory = vipGroupCategoryDao.get(group.getVipGroupCategoryId().intValue());
+					userCourseInfos.addAll(courseScheduleDao.findUserCourseInfos(GroupType.VIP, activityUserMapper.getVipGroupId().toString(), studentId, null));
+				}
+				if(Objects.nonNull(activityUserMapper.getGiveVipGroupId())){
+					userCourseInfos.addAll(courseScheduleDao.findUserCourseInfos(GroupType.VIP, activityUserMapper.getGiveVipGroupId().toString(), studentId, null));
+				}
+				if(Objects.nonNull(activityUserMapper.getPracticeGroupId())){
+					vipGroupCategory = vipGroupCategoryDao.get(1);
+					userCourseInfos.addAll(courseScheduleDao.findUserCourseInfos(GroupType.PRACTICE, activityUserMapper.getPracticeGroupId().toString(), studentId, null));
+				}
+				if(Objects.nonNull(activityUserMapper.getGivePracticeGroupId())){
+					userCourseInfos.addAll(courseScheduleDao.findUserCourseInfos(GroupType.PRACTICE, activityUserMapper.getGivePracticeGroupId().toString(), studentId, null));
+				}
+				userCourseInfos.removeAll(Collections.singleton(null));
+			}else {
+				userCourseInfos = courseScheduleDao.findUserCourseInfos(GroupType.VIP, vipGroupId.toString(), studentId, null);
 			}
-			userCourseInfos.removeAll(Collections.singleton(null));
 		}else {
 			userCourseInfos = courseScheduleDao.findUserCourseInfos(GroupType.VIP, vipGroupId.toString(), studentId, null);
 		}