Merge branch 'system_fee' of http://git.dayaedu.com/yonge/mec into system_fee

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

@@ -250,6 +250,7 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 		
 		BigDecimal totalPrice = new BigDecimal(0);
 		if (calender.getPayUserType() == STUDENT) {
+			totalPrice = calender.getMemberPaymentAmount();
 			for (MusicGroupPaymentCalenderCourseSettings courseSettings : courseSettingsList) {
 				// 剔除可选课程
 				if (courseSettings.getIsStudentOptional() == false) {
@@ -329,8 +330,9 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 		List<MusicGroupPaymentCalenderCourseSettings> courseSettingsList = musicGroupPaymentCalenderCourseSettingsDao.getWithPaymentCalender(musicGroupPaymentCalenderId);
 
 		//总金额 = 会员费用 + 课程费用
-		BigDecimal totalPrice = musicGroupPaymentCalender.getMemberPaymentAmount();
-		if(courseSettingsList.size() > 0){
+		BigDecimal totalPrice = new BigDecimal(0);
+		if (musicGroupPaymentCalender.getPayUserType() == STUDENT) {
+			totalPrice = musicGroupPaymentCalender.getMemberPaymentAmount();
 			if (musicGroupPaymentCalender.getPayUserType() == STUDENT) {
 				for (MusicGroupPaymentCalenderCourseSettings courseSettings : courseSettingsList) {
 					// 剔除可选课程