Merge remote-tracking branch 'origin/master'

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

@@ -203,12 +203,12 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
                     vipUnitPrice = practiceGroupSellPrice.getVipOneStudentTwelveCourseActivityPriceWithNewUser(), highUnitPrice;
             if(student.getIsNewUser()){
                 highUnitPrice = practiceGroupSellPrice.getHighOnlineTenCourseOriginalPriceWithNewUser();
-                if(!additionCourseInfo.containsKey(CourseSchedule.CourseScheduleType.VIP)){
-                    additionCourseInfo.remove(CourseSchedule.CourseScheduleType.PRACTICE);
-                }
                 if(additionCourseInfo.containsKey(CourseSchedule.CourseScheduleType.VIP)){
                     historyVipNum = historyVipNum + additionCourseInfo.get(CourseSchedule.CourseScheduleType.VIP);
                 }
+                if(historyVipNum<=0){
+                    additionCourseInfo.remove(CourseSchedule.CourseScheduleType.PRACTICE);
+                }
                 if(additionCourseInfo.containsKey(CourseSchedule.CourseScheduleType.HIGH)){
                     historyHighNum = historyHighNum + additionCourseInfo.get(CourseSchedule.CourseScheduleType.HIGH);
                 }
@@ -226,7 +226,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
                 }
             }else{
                 highUnitPrice = practiceGroupSellPrice.getHighOnlineTenCourseActivityPriceWithOldUser();
-                if(!additionCourseInfo.containsKey(CourseSchedule.CourseScheduleType.HIGH)){
+                if(historyHighNum<=0){
                     additionCourseInfo.remove(CourseSchedule.CourseScheduleType.PRACTICE);
                 }
             }

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) {