活动排课

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);