|
@@ -158,7 +158,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
|
|
|
for (MusicGroupPaymentCalender mgpc : musicGroupPaymentCalenderList) {
|
|
|
|
|
|
- if (date.after(mgpc.getDeadlinePaymentDate())) {
|
|
|
+ if (mgpc.getDeadlinePaymentDate() != null && date.after(mgpc.getDeadlinePaymentDate())) {
|
|
|
// “进行中”更新至“已结束”
|
|
|
mgpc.setUpdateTime(date);
|
|
|
mgpc.setPaymentStatus(PaymentStatusEnum.YES);
|
|
@@ -166,7 +166,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
|
|
|
|
|
|
// 学生状态更新已结束
|
|
|
|
|
|
- } else if (date.after(mgpc.getStartPaymentDate())) {
|
|
|
+ } else if (mgpc.getStartPaymentDate() != null && date.after(mgpc.getStartPaymentDate())) {
|
|
|
// “未开始”更新至“进行中”
|
|
|
mgpc.setUpdateTime(date);
|
|
|
mgpc.setPaymentStatus(PaymentStatusEnum.OPEN);
|