Merge remote-tracking branch 'origin/saas' into saas

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicGroupPaymentBaseCalender.java

@@ -23,7 +23,7 @@ public class MusicGroupPaymentBaseCalender {
 	@ApiModelProperty(value = "学校缴费、个人缴费", required = true)
 	private PayUserType payUserType;
 
-	@ApiModelProperty(value = "缴费类型", required = true)
+	@ApiModelProperty(value = "缴费类型", required = false)
 	private PaymentType paymentType;
 
 	@ApiModelProperty(value = "缴费开始时间", required = true)

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupPaymentCalenderCourseSettings.java

@@ -35,7 +35,7 @@ public class MusicGroupPaymentCalenderCourseSettings extends BaseEntity {
 	private java.math.BigDecimal courseCurrentPrice;
 	
 	/** 是否学生可选 */
-	private boolean isStudentOptional = false;
+	private boolean isStudentOptional = true;
 	
 	/**  */
 	private java.util.Date createTime;

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

@@ -101,13 +101,7 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 		Date date = new Date();
 		MusicGroupPaymentCalender calender = musicGroupPaymentCalenderService.get(calenderDetails.get(0).getMusicGroupPaymentCalenderId());
 		MusicGroup musicGroup = musicGroupDao.get(calender.getMusicGroupId());
-		//缴费项目已结束，并且没有单独开启缴费的学员，不能修改缴费金额
-//		if(calender.getStatus() == OVER){
-//			List<MusicGroupPaymentCalenderDetail> paymentCalenderDetails = calenderDetails.stream().filter(e -> e.getOpenFlag() == YesOrNoEnum.NO).collect(Collectors.toList());
-//			if(paymentCalenderDetails != null && paymentCalenderDetails.size() > 0){
-//				throw new BizException("修改失败：存在未开启缴费的学员");
-//			}
-//		}
+
 		if(calender.getPaymentAmount().doubleValue() > 0d){
 			BigDecimal totalAmount = calender.getPaymentAmount();
 			BigDecimal subExpectAmount = expectAmount;

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

@@ -557,6 +557,15 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 				throw new BizException("创建失败，已经存在缴费信息");
 			}
 		}
+		if(musicGroup.getStatus() == MusicGroupStatusEnum.PROGRESS){
+			musicGroupPaymentBaseCalender.setPaymentType(MUSIC_APPLY);
+		}else {
+			if(musicGroupPaymentBaseCalender.getMusicGroupOrganizationCourseSettingId() != null){
+				musicGroupPaymentBaseCalender.setPaymentType(MUSIC_RENEW);
+			}else {
+				musicGroupPaymentBaseCalender.setPaymentType(ADD_COURSE);
+			}
+		}
 		musicGroupPaymentBaseCalender.setMusicGroup(musicGroup);
 
 		PaymentCalenderStatusEnum status = PaymentCalenderStatusEnum.NO;