报名缴费bug

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupPaymentCalenderServiceImpl.java

@@ -448,14 +448,16 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 
     public Map<String, Object> getCalenderDetail(Map<String, Object> result, Long calenderId) {
         //课程
-        result.put("course", musicGroupPaymentCalenderCourseSettingsService.queryCalenderCourseSettings(calenderId));
+        List<MusicGroupPaymentCalenderCourseSettings> courseSettingsList = musicGroupPaymentCalenderCourseSettingsService.queryCalenderCourseSettings(calenderId);
+        result.put("course", courseSettingsList==null?null:courseSettingsList.size() == 0?null:courseSettingsList);
         //乐保
         result.put("repair", musicGroupPaymentCalenderRepairService.findByCalenderId(calenderId));
         MusicGroupPaymentCalenderMember calenderMember = musicGroupPaymentCalenderMemberService.findByCalenderId(calenderId);
         //会员信息
         result.put("member", calenderMember);
         //活动相关信息
-        result.put("activity", musicGroupPaymentCalenderActivityService.findByCalenderId(calenderId));
+        List<MusicGroupPaymentCalenderActivity> byCalenderId = musicGroupPaymentCalenderActivityService.findByCalenderId(calenderId);
+        result.put("activity", byCalenderId==null?null:byCalenderId.size() == 0?null:byCalenderId);
         if (calenderMember != null) {
             result.put("memberPrivilegesItemList", memberRankPrivilegesService.queryByMemberRankId(calenderMember.getMemberRankSettingId()));
         }

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -192,10 +192,10 @@ public class StudentOrderController extends BaseController {
             orderDetail.put("chargeTypeId", musicGroup.getChargeTypeId());
             orderDetail.put("courseViewType", musicGroup.getCourseViewType());
             //如果包含vip和网管，代表购买了活动包
-            if (orderDetailType.contains("VIP") || orderDetailType.contains("PRACTICE")) {
-                List<Long> activityList = orderDetail1.stream().filter(e -> e.getType() == OrderDetailTypeEnum.VIP
-                                || e.getType() == OrderDetailTypeEnum.PRACTICE).map(e -> e.getStudentInstrumentId())
-                        .collect(Collectors.toList());
+            List<Long> activityList = orderDetail1.stream().filter(e -> e.getType() == OrderDetailTypeEnum.VIP
+                    || e.getType() == OrderDetailTypeEnum.PRACTICE).map(e -> e.getStudentInstrumentId())
+                    .collect(Collectors.toList());
+            if(activityList != null && activityList.size() > 0){
                 orderDetail.put("activity", musicGroupPaymentCalenderActivityService.findByIds(activityList));
             }