Merge branch 'online1'

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

@@ -34,8 +34,8 @@ public class MusicGroupOrganizationCourseSettingsServiceImpl extends BaseService
         }
 
 		for (MusicGroupOrganizationCourseSettingsDetail detail : setting.getDetails()) {
-			if (detail.getCourseTotalMinuties() <= 0) {
-				throw new BizException(detail.getCourseType().getMsg() + "课程总时长必须大于0");
+			if (detail.getCourseTotalMinuties() < 0) {
+				throw new BizException(detail.getCourseType().getMsg() + "课程总时长不能为负数");
 			}
 			setting.setTotalCurrentPrice(setting.getTotalCurrentPrice().add(detail.getCourseCurrentPrice()));
 			setting.setTotalOriginalPrice(setting.getTotalOriginalPrice().add(detail.getCourseOriginalPrice()));

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

@@ -1122,7 +1122,11 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			for (MusicGroupPaymentCalender musicGroupPaymentCalender : musicGroupPaymentCalenders) {
 				//如果是报名项目，将乐团改为审核中，缴费项目修改状态，审核状态改为审核通过
 				if(musicGroupPaymentCalender.getPayUserType() == SCHOOL){
-					musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.OPEN);
+					if(musicGroupPaymentCalender.getPaymentAmount().doubleValue() > 0){
+						musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.OPEN);
+					}else{
+						musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.PAID);
+					}
 				}else if (date.after(musicGroupPaymentCalender.getStartPaymentDate())) {
 					musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.OPEN);
 				}else if (date.after(musicGroupPaymentCalender.getDeadlinePaymentDate())) {