|
@@ -213,7 +213,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- public String createGroup(SubFeeSettingDto subFeeSettingDto){
|
|
|
+ public String createGroup(SubFeeSettingDto subFeeSettingDto) {
|
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
if (sysUser == null || sysUser.getId() == null) {
|
|
|
throw new BizException("获取用户信息失败");
|
|
@@ -465,7 +465,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
|
|
|
//获取课程价格
|
|
|
MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(studentRegistration.getMusicGroupId(), studentRegistration.getActualSubjectId());
|
|
|
- BigDecimal courseFee = musicOneSubjectClassPlan.getFee();
|
|
|
+ BigDecimal courseFee = musicOneSubjectClassPlan.getFee() == null ? BigDecimal.ZERO : musicOneSubjectClassPlan.getFee();
|
|
|
if (studentRegistration.getTemporaryCourseFee() != null) {
|
|
|
courseFee = studentRegistration.getTemporaryCourseFee();
|
|
|
}
|
|
@@ -680,7 +680,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
|
|
|
//获取课程价格
|
|
|
MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(studentRegistration.getMusicGroupId(), studentRegistration.getActualSubjectId());
|
|
|
- BigDecimal courseFee = musicOneSubjectClassPlan.getFee();
|
|
|
+ BigDecimal courseFee = musicOneSubjectClassPlan.getFee() == null ? BigDecimal.ZERO : musicOneSubjectClassPlan.getFee();
|
|
|
if (studentRegistration.getTemporaryCourseFee() != null) {
|
|
|
courseFee = studentRegistration.getTemporaryCourseFee();
|
|
|
}
|