Merge branch 'feature/0529-live' into master_saas

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

@@ -562,7 +562,11 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         }
 
         vipGroupApplyBaseInfoDto.setAuditStatus(AuditStatusEnum.PASS);
-        vipGroupApplyBaseInfoDto.setStatus(VipGroupStatusEnum.APPLYING);
+        if (now.after(vipGroupApplyBaseInfoDto.getRegistrationStartTime())) {
+            vipGroupApplyBaseInfoDto.setStatus(VipGroupStatusEnum.APPLYING);
+        }else {
+            vipGroupApplyBaseInfoDto.setStatus(VipGroupStatusEnum.NOT_START);
+        }
 
          vipGroupApplyBaseInfoDto.setTotalPrice(costInfo.getOrDefault("totalPrice", ZERO));
          vipGroupApplyBaseInfoDto.setOriginalTotalPrice(costInfo.getOrDefault("originalTotalPrice", ZERO));
@@ -2162,6 +2166,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));
                 // 排课时间排序
@@ -4620,7 +4636,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         }
         
         //更新到报名中
-/*        List<VipGroup> normalVipGroupList = vipGroupDao.queryNormalStatusList();
+        List<VipGroup> normalVipGroupList = vipGroupDao.queryNormalStatusList();
         if (!CollectionUtils.isEmpty(normalVipGroupList)) {
             List<VipGroup> needUpdateVipGroups = new ArrayList<>();
             for (VipGroup vipGroup : normalVipGroupList) {
@@ -4635,7 +4651,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             if (!CollectionUtils.isEmpty(needUpdateVipGroups)) {
                 vipGroupDao.batchUpdate(needUpdateVipGroups);
             }
-        }*/
+        }
     }
 
     @Override
@@ -4648,18 +4664,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());

mec-im/src/main/java/com/ym/dao/RoomMemberDao.java

@@ -17,7 +17,7 @@ import java.util.List;
 public interface RoomMemberDao extends JpaRepository<RoomMember, Long> {
     List<RoomMember> findByRid(String rid);
 
-    @Lock(value = LockModeType.PESSIMISTIC_WRITE)
+    //@Lock(value = LockModeType.PESSIMISTIC_WRITE)
     RoomMember findByRidAndUid(String rid, String uid);
 
     List<RoomMember> findByRidAndRole(String rid, int role);