Explorar el Código

查询状态,报名截止时间取缴费项目上的截止时间

周箭河 hace 4 años
padre
commit
24a1844257

+ 6 - 4
mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -1049,8 +1049,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         musicGroupDao.update(musicGroup);
         //修改缴费项目状态
         List<MusicGroupPaymentCalender> musicGroupPaymentCalenders = musicGroupPaymentCalenderDao.findByMusicGroupId(musicGroupId);
-        if(musicGroupPaymentCalenders != null && musicGroupPaymentCalenders.size() > 0){
-            musicGroupPaymentCalenders.forEach(e->{
+        if (musicGroupPaymentCalenders != null && musicGroupPaymentCalenders.size() > 0) {
+            musicGroupPaymentCalenders.forEach(e -> {
                 e.setStatus(MusicGroupPaymentCalender.PaymentCalenderStatusEnum.REJECT);
             });
             musicGroupPaymentCalenderDao.batchUpdate(musicGroupPaymentCalenders);
@@ -1409,8 +1409,10 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         musicGroupDao.update(musicGroup);
 
         MusicGroupPaymentCalender regCalender = musicGroupPaymentCalenderService.findByMusicGroupRegCalender(musicGroup.getId());
-        regCalender.setDeadlinePaymentDate(expireDate);
-        musicGroupPaymentCalenderService.update(regCalender);
+        if (regCalender != null) {
+            regCalender.setDeadlinePaymentDate(expireDate);
+            musicGroupPaymentCalenderService.update(regCalender);
+        }
 
         musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "延长缴费", sysUser.getId(), ""));
         Set<Integer> roleIds = new HashSet<>(4);