|
@@ -514,7 +514,14 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
public Map<String, Object> getCalenderDetail(Map<String, Object> result, Long calenderId) {
|
|
|
//课程
|
|
|
List<MusicGroupPaymentCalenderCourseSettings> courseSettingsList = musicGroupPaymentCalenderCourseSettingsService.queryCalenderCourseSettings(calenderId);
|
|
|
- result.put("course", courseSettingsList==null?null:courseSettingsList.size() == 0?null:courseSettingsList);
|
|
|
+ if (CollectionUtils.isNotEmpty(courseSettingsList)){
|
|
|
+ courseSettingsList.forEach(e -> {
|
|
|
+ e.setOverflowCoursePrice(BigDecimal.ZERO);
|
|
|
+ });
|
|
|
+ result.put("course", courseSettingsList);
|
|
|
+ }else {
|
|
|
+ result.put("course", null);
|
|
|
+ }
|
|
|
//乐保
|
|
|
result.put("repair", musicGroupPaymentCalenderRepairService.findByCalenderId(calenderId));
|
|
|
MusicGroupPaymentCalenderMember calenderMember = musicGroupPaymentCalenderMemberService.findByCalenderId(calenderId);
|