|  | @@ -1793,25 +1793,19 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 | 
	
		
			
				|  |  |  			
 | 
	
		
			
				|  |  |  			// 删除乐团相关付费周期
 | 
	
		
			
				|  |  |  			musicGroupPaymentCalenderDao.delByGroupId(musicGroupId);
 | 
	
		
			
				|  |  | -//			musicGroupStudentFeeDao.deleteByMusicGroupId(musicGroupId,0);
 | 
	
		
			
				|  |  |  			if (months != null && months.size() > 0) {
 | 
	
		
			
				|  |  |  				// 批量插入
 | 
	
		
			
				|  |  |  				musicGroupPaymentCalenderDao.batchAdd(months, musicGroupId);
 | 
	
		
			
				|  |  |  			}
 | 
	
		
			
				|  |  | -			if(musicGroup.getStatus() == MusicGroupStatusEnum.PROGRESS){
 | 
	
		
			
				|  |  | -			    //修改未锁定学员缴费周期
 | 
	
		
			
				|  |  | -                String join = null;
 | 
	
		
			
				|  |  | -                if (months != null && months.size() > 0)  {
 | 
	
		
			
				|  |  | -                    join = StringUtils.join(months,",");
 | 
	
		
			
				|  |  | -                }
 | 
	
		
			
				|  |  | -                musicGroupStudentFeeDao.batchUpdateCalender(join,musicGroupId);
 | 
	
		
			
				|  |  | -                /*//生成学员费用表
 | 
	
		
			
				|  |  | -                List<MusicGroupStudentFee> musicGroupStudentFees = musicGroupStudentFeeDao.initMusicGroupStudentFee(musicGroupId);
 | 
	
		
			
				|  |  | -                if(musicGroupStudentFees != null && musicGroupStudentFees.size() > 0){
 | 
	
		
			
				|  |  | -                    musicGroupStudentFeeDao.batchInsert(musicGroupStudentFees,musicGroupPaymentCalenderService.getNextPaymentDate(musicGroupId, null,null),"PAID_COMPLETED");
 | 
	
		
			
				|  |  | -                }*/
 | 
	
		
			
				|  |  | -            }
 | 
	
		
			
				|  |  |  		}
 | 
	
		
			
				|  |  | +        if(musicGroup.getStatus() == MusicGroupStatusEnum.PROGRESS){
 | 
	
		
			
				|  |  | +            //修改未锁定学员缴费周期
 | 
	
		
			
				|  |  | +            String join = null;
 | 
	
		
			
				|  |  | +            if (months != null && months.size() > 0)  {
 | 
	
		
			
				|  |  | +                join = StringUtils.join(months,",");
 | 
	
		
			
				|  |  | +            }
 | 
	
		
			
				|  |  | +            musicGroupStudentFeeDao.batchUpdateCalender(join,musicGroupId);
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  |          musicGroupDao.update(musicGroup);
 | 
	
		
			
				|  |  |          //修改课程里面的教学点
 | 
	
		
			
				|  |  |          if(!musicGroup.getSchoolId().equals(musicGroup.getSchoolId())){
 |