获取乐团计划和乐器

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

@@ -154,10 +154,10 @@ public class MusicGroupController extends BaseController {
             if (musicGroup.getStatus() == MusicGroupStatusEnum.PAY) {
                 Date now = new Date();
                 MusicGroupPaymentCalender regCalender = musicGroupPaymentCalenderDao.findByMusicGroupRegCalender(musicGroupId);
-                if (regCalender != null) {
+                if (regCalender != null && regCalender.getDeadlinePaymentDate() != null) {
                     musicGroup.setPaymentExpireDate(regCalender.getDeadlinePaymentDate());
                 }
-                if (regCalender !=null && DateUtil.daysBetween(musicGroup.getPaymentExpireDate(), now) > 1) {
+                if (musicGroup.getPaymentExpireDate() != null && DateUtil.daysBetween(musicGroup.getPaymentExpireDate(), now) > 1) {
                     return failed("乐团缴费时间已截止");
                 }
             }