update

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentVipGroupDetailDto.java

@@ -27,4 +27,6 @@ public class StudentVipGroupDetailDto extends StudentVipGroupShowListDto {
 
     @ApiModelProperty("直播间配置信息")
     private String liveConfigJson;
+
+    private Boolean alertSubjectFlag = false;
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/VipGroupPayInfoDto.java

@@ -21,5 +21,4 @@ public class VipGroupPayInfoDto {
 
     private Integer tenantId;
 
-    private Boolean alertSubjectFlag = false;
 }

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

@@ -2162,6 +2162,18 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 throw new BizException("未找到指定课程");
             }
             StudentVipGroupDetailDto vipGroupDetail = vipGroupDao.getVipGroupDetail(groupId);
+            if("LIVE".equals(vipGroup.getGroupType())){
+                ImLiveBroadcastRoomDto roomDto = JSON.parseObject(vipGroup.getLiveConfigJson(), ImLiveBroadcastRoomDto.class);
+                String subjectId = roomDto.getSubjectId();
+                Subject subject = subjectDao.get(Integer.parseInt(subjectId));
+                //乐理不提醒
+                if(!subject.getParentSubjectId().equals(30)){
+                    Student student = studentDao.get(sysUserService.getUserId());
+                    if(!student.getSubjectIdList().equals(subjectId)){
+                        vipGroupDetail.setAlertSubjectFlag(true);
+                    }
+                }
+            }
             if (StringUtils.isNotEmpty(vipGroup.getCourseSchedulesJson())) {
                 vipGroupDetail.setCourseSchedules(JSON.parseArray(vipGroup.getCourseSchedulesJson(), CourseSchedule.class));
                 // 排课时间排序
@@ -4648,18 +4660,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             throw new BizException("未找到此课程");
         }
         VipGroupPayInfoDto vipGroupPayInfo = new VipGroupPayInfoDto();
-        if("LIVE".equals(vipGroup.getGroupType())){
-            ImLiveBroadcastRoomDto roomDto = JSON.parseObject(vipGroup.getLiveConfigJson(), ImLiveBroadcastRoomDto.class);
-            String subjectId = roomDto.getSubjectId();
-            Subject subject = subjectDao.get(Integer.parseInt(subjectId));
-            //乐理不提醒
-            if(!subject.getParentSubjectId().equals(30)){
-                Student student = studentDao.get(userId);
-                if(!student.getSubjectIdList().equals(subjectId)){
-                    vipGroupPayInfo.setAlertSubjectFlag(true);
-                }
-            }
-        }
         vipGroupPayInfo.setTenantId(vipGroup.getTenantId());
         vipGroupPayInfo.setVipGroupId(vipGroup.getId().intValue());
         vipGroupPayInfo.setViipGroupName(vipGroup.getName());