Merge branch 'feature/0529-live' of http://git.dayaedu.com/yonge/mec into feature/0529-live

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

@@ -4622,7 +4622,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         courseScheduleStudentPaymentDao.batchInsert(courseScheduleStudentPayments);
 
         imGroupService.create(classGroup.getId().toString(), null, classGroup.getName(), classGroup.getName(),
-                vipGroup.getName(), null, "https://gyt.ks3-cn-beijing.ksyuncs.com/icon_live_class_group_avatar.png", vipGroup.getGroupType(), ImGroup.GroupTypeEnum.valueOf(vipGroup.getGroupType()));
+                vipGroup.getName(), null, "https://gyt.ks3-cn-beijing.ksyuncs.com/icon_live_class_group_avatar.png",
+                vipGroup.getGroupType(), ImGroup.GroupTypeEnum.valueOf(vipGroup.getGroupType()));
         imGroupMemberService.join(classGroup.getId().toString(), userRoleMap);
         imUserFriendService.refreshGroupImUserFriend(classGroup.getMusicGroupId(), classGroup.getGroupType());
         classGroupDao.update(classGroup);

mec-web/src/main/java/com/ym/mec/web/controller/TaskController.java

@@ -283,8 +283,13 @@ public class TaskController extends BaseController {
 	public void updateVipGroupToFinishedStatus() {
 		//更新vip课程状态
 		vipGroupService.updateVipGroupStatusToFinished();
-		//更新直播课状态
-		vipGroupService.createLiveCourse();
+		List<TenantInfo> tenantInfos = tenantInfoService.list(new QueryWrapper<TenantInfo>().eq("state_",1));
+		if(tenantInfos != null && tenantInfos.size() > 0){
+			for (TenantInfo tenantInfo : tenantInfos) {
+				//更新直播课状态
+				vipGroupService.createLiveCourse();
+			}
+		}
 	}
 
 	@GetMapping("/stopVipGroupWithNoCreate")
@@ -298,7 +303,9 @@ public class TaskController extends BaseController {
 		List<TenantInfo> tenantInfos = tenantInfoService.list(new QueryWrapper<TenantInfo>().eq("state_",1));
 		if(tenantInfos != null && tenantInfos.size() > 0){
 			for (TenantInfo tenantInfo : tenantInfos) {
+				TenantContextHolder.setTenantId(tenantInfo.getId());
 				teacherAttendanceService.pushNoSignOutMessage(tenantInfo.getId());
+				TenantContextHolder.clearTenantId();
 			}
 		}
 	}