Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupPaymentCalenderService.java

@@ -64,6 +64,13 @@ public interface MusicGroupPaymentCalenderService extends BaseService<Long, Musi
 	 * @param id
 	 */
 	void del(Long id);
+	
+	/**
+	 * 根据批次号删除对象
+	 * @param batchNo
+	 * @return
+	 */
+	boolean deleteByBatchNo(String batchNo);
 
 	/**
 	 * 推送乐团缴费提醒

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

@@ -1225,6 +1225,9 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		if (calender == null) {
 			throw new BizException("缴费信息不存在");
 		}
+		if(calender.getPaymentType() == MUSIC_APPLY){
+			throw new BizException("报名的缴费记录不能删除");
+		}
 		if (calender.getStatus() != PaymentCalenderStatusEnum.AUDITING && calender.getStatus() != PaymentCalenderStatusEnum.NO
 				&& calender.getStatus() != PaymentCalenderStatusEnum.REJECT) {
 			throw new BizException("删除失败,只有[审核中]、[拒绝]或[未开启缴费]状态才能删除");
@@ -1262,6 +1265,19 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public boolean deleteByBatchNo(String batchNo) {
+		if(StringUtils.isBlank(batchNo)){
+			throw new BizException("参数错误");
+		}
+		List<MusicGroupPaymentCalender> musicGroupPaymentCalenderList = musicGroupPaymentCalenderDao.findByBatchNo(batchNo);
+		for(MusicGroupPaymentCalender musicGroupPaymentCalender : musicGroupPaymentCalenderList){
+			del(musicGroupPaymentCalender.getId());
+		}
+		return true;
+	}
+
+	@Override
 	public void paymentPush(Long id, String userIds) {
 		// 推送所有
 		if (StringUtils.isEmpty(userIds)) {

mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupPaymentCalenderController.java

@@ -85,6 +85,14 @@ public class MusicGroupPaymentCalenderController extends BaseController {
         return succeed();
     }
 
+    @ApiOperation(value = "删除乐团缴费日历")
+    @PostMapping("/delByBatchNo")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentCalender/delByBatchNo')")
+    public Object delByBatchNo(String batchNo) {
+        musicGroupPaymentCalenderService.deleteByBatchNo(batchNo);
+        return succeed();
+    }
+
     @ApiOperation(value = "修改乐团缴费时间")
     @PostMapping("/update")
     @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentCalender/update')")