Merge remote-tracking branch 'origin/master'

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

@@ -426,23 +426,20 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 
 		// 如果是报名，需要修改乐团状态
 		if (paymentType == MUSIC_APPLY) {
-			int countAuditReject = musicGroupPaymentCalenderDao.countAuditReject(musicGroupId, null);
-			if (countAuditReject == 0) {
-				if (musicGroup.getStatus() != MusicGroupStatusEnum.DRAFT) {
-					throw new BizException("创建失败：缴费项目类型不匹配");
-				}
-				if (status != AUDITING) {
-					musicGroup.setStatus(MusicGroupStatusEnum.AUDIT);
-					// 记录操作日志
-					musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "报名缴费项目创建成功（草稿 -> 基础信息审核中）", sysUser.getId(), ""));
-				} else {
-					musicGroup.setStatus(MusicGroupStatusEnum.FEE_AUDIT);
-					// 记录操作日志
-					musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "报名缴费项目创建成功（草稿 -> 费用审核中）", sysUser.getId(), ""));
-				}
-				musicGroup.setUpdateTime(date);
-				musicGroupDao.update(musicGroup);
+			if (musicGroup.getStatus() != MusicGroupStatusEnum.DRAFT) {
+				throw new BizException("创建失败：缴费项目类型不匹配");
 			}
+			if (status != AUDITING) {
+				musicGroup.setStatus(MusicGroupStatusEnum.AUDIT);
+				// 记录操作日志
+				musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "报名缴费项目创建成功（草稿 -> 基础信息审核中）", sysUser.getId(), ""));
+			} else {
+				musicGroup.setStatus(MusicGroupStatusEnum.FEE_AUDIT);
+				// 记录操作日志
+				musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "报名缴费项目创建成功（草稿 -> 费用审核中）", sysUser.getId(), ""));
+			}
+			musicGroup.setUpdateTime(date);
+			musicGroupDao.update(musicGroup);
 		}
 
 		if (status == AUDITING) {
@@ -713,23 +710,20 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 
 		// 如果是报名，需要修改乐团状态
 		if (paymentType == MUSIC_APPLY) {
-			int countAuditReject = musicGroupPaymentCalenderDao.countAuditReject(musicGroupId, null);
-			if (countAuditReject == 0) {
-				if (musicGroup.getStatus() != MusicGroupStatusEnum.DRAFT) {
-					throw new BizException("创建失败：缴费项目类型不匹配");
-				}
-				if (status != AUDITING) {
-					musicGroup.setStatus(MusicGroupStatusEnum.AUDIT);
-					// 记录操作日志
-					musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "报名缴费项目创建成功（草稿 -> 基础信息审核中）", sysUser.getId(), ""));
-				} else {
-					musicGroup.setStatus(MusicGroupStatusEnum.FEE_AUDIT);
-					// 记录操作日志
-					musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "报名缴费项目创建成功（草稿 -> 费用审核中）", sysUser.getId(), ""));
-				}
-				musicGroup.setUpdateTime(date);
-				musicGroupDao.update(musicGroup);
+			if (musicGroup.getStatus() != MusicGroupStatusEnum.DRAFT) {
+				throw new BizException("创建失败：缴费项目类型不匹配");
 			}
+			if (status != AUDITING) {
+				musicGroup.setStatus(MusicGroupStatusEnum.AUDIT);
+				// 记录操作日志
+				musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "报名缴费项目创建成功（草稿 -> 基础信息审核中）", sysUser.getId(), ""));
+			} else {
+				musicGroup.setStatus(MusicGroupStatusEnum.FEE_AUDIT);
+				// 记录操作日志
+				musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "报名缴费项目创建成功（草稿 -> 费用审核中）", sysUser.getId(), ""));
+			}
+			musicGroup.setUpdateTime(date);
+			musicGroupDao.update(musicGroup);
 		}
 
 		if (status == AUDITING) {
@@ -1056,7 +1050,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		//如果是报名，并且所有的报名都审核通过，需要修改乐团状态
 		if (calender.getPaymentType() == MUSIC_APPLY) {
 			MusicGroup musicGroup = musicGroupDao.get(calender.getMusicGroupId());
-			musicGroup.setStatus(MusicGroupStatusEnum.DRAFT);
+			musicGroup.setStatus(MusicGroupStatusEnum.AUDIT_FAILED);
 			musicGroup.setUpdateTime(date);
 			musicGroupDao.update(musicGroup);
 			//记录操作日志