|
@@ -2147,7 +2147,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
ChargeType chargeType = chargeTypeDao.get(musicGroup.getChargeTypeId());
|
|
ChargeType chargeType = chargeTypeDao.get(musicGroup.getChargeTypeId());
|
|
|
musicGroup.setChargeTypeName(chargeType.getName());
|
|
musicGroup.setChargeTypeName(chargeType.getName());
|
|
|
MusicGroupPaymentCalender regCalender = musicGroupPaymentCalenderService.findByMusicGroupRegCalender(musicGroup.getId());
|
|
MusicGroupPaymentCalender regCalender = musicGroupPaymentCalenderService.findByMusicGroupRegCalender(musicGroup.getId());
|
|
|
- if (regCalender != null&& regCalender.getPayUserType().equals(MusicGroupPaymentCalender.PayUserType.STUDENT)) {
|
|
|
|
|
|
|
+ if (regCalender != null && regCalender.getPayUserType().equals(MusicGroupPaymentCalender.PayUserType.STUDENT)) {
|
|
|
musicGroup.setPaymentExpireDate(regCalender.getDeadlinePaymentDate());
|
|
musicGroup.setPaymentExpireDate(regCalender.getDeadlinePaymentDate());
|
|
|
}
|
|
}
|
|
|
subFeeSettingDto.setMusicGroup(musicGroup);
|
|
subFeeSettingDto.setMusicGroup(musicGroup);
|