管乐迷商城改造

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

@@ -291,7 +291,9 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
             // 不是进行中，只能创建一次缴费
             if (musicGroup.getStatus() != MusicGroupStatusEnum.PROGRESS && musicGroupPaymentCalender.getPaymentType() != GOODS_PURCHASE) {
                 List<MusicGroupPaymentCalender> list = musicGroupPaymentCalenderDao.findByMusicGroupId(musicGroupId);
-                if (list.size() > 0) {
+                //排除商品采购
+                List<MusicGroupPaymentCalender> collect = list.stream().filter(e -> e.getPaymentType() != GOODS_PURCHASE).collect(Collectors.toList());
+                if (collect.size() > 0) {
                     throw new BizException("创建失败，已经存在缴费信息");
                 }
             }