|  | @@ -1607,13 +1607,13 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 | 
											
												
													
														|  |              SysUser operator = sysUserFeignService.queryUserInfo();
 |  |              SysUser operator = sysUserFeignService.queryUserInfo();
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |              BigDecimal price = courseScheduleStudentPaymentDao.countFinishCoursePriceWithMusicGroup(musicGroupId, GroupType.MUSIC);
 |  |              BigDecimal price = courseScheduleStudentPaymentDao.countFinishCoursePriceWithMusicGroup(musicGroupId, GroupType.MUSIC);
 | 
											
												
													
														|  | -            BigDecimal amount = studentRegistration.getSurplusCourseFee();
 |  | 
 | 
											
												
													
														|  | 
 |  | +            BigDecimal subtractAmount = studentRegistration.getSurplusCourseFee();
 | 
											
												
													
														|  |              if(Objects.isNull(price)){
 |  |              if(Objects.isNull(price)){
 | 
											
												
													
														|  |                  price = new BigDecimal(0);
 |  |                  price = new BigDecimal(0);
 | 
											
												
													
														|  |              }
 |  |              }
 | 
											
												
													
														|  | -            amount = amount.subtract(price);
 |  | 
 | 
											
												
													
														|  | 
 |  | +            subtractAmount = subtractAmount.subtract(price);
 | 
											
												
													
														|  |              
 |  |              
 | 
											
												
													
														|  | -            studentRegistrationService.updateUserSurplusCourseFee(userId, musicGroupId, amount.negate(), reason, operator.getId());
 |  | 
 | 
											
												
													
														|  | 
 |  | +            studentRegistrationService.updateUserSurplusCourseFee(userId, musicGroupId, subtractAmount.negate(), reason, operator.getId());
 | 
											
												
													
														|  |              
 |  |              
 | 
											
												
													
														|  |              
 |  |              
 | 
											
												
													
														|  |              //更新服务指标、运营指标
 |  |              //更新服务指标、运营指标
 | 
											
										
											
												
													
														|  | @@ -1757,13 +1757,13 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 | 
											
												
													
														|  |          SysUser operator = sysUserFeignService.queryUserInfo();
 |  |          SysUser operator = sysUserFeignService.queryUserInfo();
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |          BigDecimal price = courseScheduleStudentPaymentDao.countFinishCoursePriceWithMusicGroup(musicGroupId, GroupType.MUSIC);
 |  |          BigDecimal price = courseScheduleStudentPaymentDao.countFinishCoursePriceWithMusicGroup(musicGroupId, GroupType.MUSIC);
 | 
											
												
													
														|  | -        BigDecimal amount = studentRegistration.getSurplusCourseFee();
 |  | 
 | 
											
												
													
														|  | 
 |  | +        BigDecimal subtractAmount = studentRegistration.getSurplusCourseFee();
 | 
											
												
													
														|  |          if(Objects.isNull(price)){
 |  |          if(Objects.isNull(price)){
 | 
											
												
													
														|  |              price = new BigDecimal(0);
 |  |              price = new BigDecimal(0);
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  | -        amount = amount.subtract(price);
 |  | 
 | 
											
												
													
														|  | 
 |  | +        subtractAmount = subtractAmount.subtract(price);
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | -        studentRegistrationService.updateUserSurplusCourseFee(userId, musicGroupId, amount.negate(), reason, operator.getId());
 |  | 
 | 
											
												
													
														|  | 
 |  | +        studentRegistrationService.updateUserSurplusCourseFee(userId, musicGroupId, subtractAmount.negate(), reason, operator.getId());
 | 
											
												
													
														|  |          
 |  |          
 | 
											
												
													
														|  |          //更新服务指标、运营指标
 |  |          //更新服务指标、运营指标
 | 
											
												
													
														|  |          int remainCourseNum = courseScheduleStudentPaymentDao.countStudentNotStartCourseNumWithCourseType(userId, null);
 |  |          int remainCourseNum = courseScheduleStudentPaymentDao.countStudentNotStartCourseNumWithCourseType(userId, null);
 |