缴费项目改造

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

@@ -1953,25 +1953,23 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
     @Override
     public boolean deleteMusicGroup(String musicGroupId) {
-
         MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
-
         if (musicGroup == null) {
             throw new BizException("乐团不存在");
         }
-
         if (musicGroup.getDelFlag() == true) {
             throw new BizException("乐团已删除");
         }
-
         if (musicGroup.getStatus() != MusicGroupStatusEnum.CANCELED) {
             throw new BizException("乐团当前状态是{}，不能删除", musicGroup.getStatus().getMsg());
         }
-
+        MusicGroupPaymentCalender musicGroupRegCalender = musicGroupPaymentCalenderService.findByMusicGroupRegCalender(musicGroupId);
+        if(Objects.nonNull(musicGroupRegCalender)){
+            musicGroupPaymentCalenderService.del(musicGroupRegCalender.getId());
+        }
         musicGroup.setUpdateTime(new Date());
         musicGroup.setDelFlag(true);
         musicGroupDao.update(musicGroup);
-
         return true;
     }