|  | @@ -377,6 +377,10 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 | 
	
		
			
				|  |  |              // 计算老师课薪
 | 
	
		
			
				|  |  |              costInfo = countVipGroupPredictFee1(vipGroupApplyBaseInfoDto, vipGroupApplyBaseInfoDto.getUserId(), null);
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  | +        if (CourseSchedule.CourseScheduleType.LIVE.getCode().equals(groupType)) {
 | 
	
		
			
				|  |  | +            costInfo.put("totalPrice",
 | 
	
		
			
				|  |  | +                    vipGroupApplyBaseInfoDto.getOnlineClassesUnitPrice().multiply(new BigDecimal(vipGroupApplyBaseInfoDto.getOnlineClassesNum())));
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          vipGroupApplyBaseInfoDto.setAuditStatus(AuditStatusEnum.PASS);
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -386,7 +390,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 | 
	
		
			
				|  |  |  //			vipGroupApplyBaseInfoDto.setAuditStatus(AuditStatusEnum.ING);
 | 
	
		
			
				|  |  |  //		}
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -        vipGroupApplyBaseInfoDto.setTotalPrice(costInfo.getOrDefault("totalPrice", ZERO));
 | 
	
		
			
				|  |  | +         vipGroupApplyBaseInfoDto.setTotalPrice(costInfo.getOrDefault("totalPrice", ZERO));
 | 
	
		
			
				|  |  |          if (CollectionUtils.isEmpty(vscps)) {
 | 
	
		
			
				|  |  |              vscps = new ArrayList<>();
 | 
	
		
			
				|  |  |              for (Integer canBuyStudentId : canBuyStudentIds) {
 | 
	
	
		
			
				|  | @@ -4452,12 +4456,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          baseInfoDto.setOrganName(organizationDao.findByOrganIds(organIdList).stream().collect(Collectors.joining(",")));
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -        String subjectIdList = baseInfoDto.getSubjectIdList();
 | 
	
		
			
				|  |  | -        if ("-1".equals(subjectIdList)) {
 | 
	
		
			
				|  |  | -            baseInfoDto.setSubjectName("乐理");
 | 
	
		
			
				|  |  | -        } else {
 | 
	
		
			
				|  |  | -            baseInfoDto.setSubjectName(subjectDao.findNames(subjectIdList));
 | 
	
		
			
				|  |  | -        }
 | 
	
		
			
				|  |  |          Integer educationalTeacherId = baseInfoDto.getEducationalTeacherId();
 | 
	
		
			
				|  |  |          if (Objects.nonNull(educationalTeacherId)) {
 | 
	
		
			
				|  |  |              baseInfoDto.setEducationalTeacherName(sysUserService.queryUserById(educationalTeacherId).getRealName());
 | 
	
	
		
			
				|  | @@ -4477,6 +4475,13 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 | 
	
		
			
				|  |  |          imLiveBroadcastRoomDto.setSpeakerName(sysUser.getRealName());
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +        String subjectId = imLiveBroadcastRoomDto.getSubjectId();
 | 
	
		
			
				|  |  | +        if ("-1".equals(subjectId)) {
 | 
	
		
			
				|  |  | +            baseInfoDto.setSubjectName("乐理");
 | 
	
		
			
				|  |  | +        } else {
 | 
	
		
			
				|  |  | +            baseInfoDto.setSubjectName(subjectDao.findNames(subjectId));
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |          return vipGroupApplyDto;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      }
 |