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

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

@@ -392,6 +392,7 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 		Map<Integer, List<CourseSchedule>> memberCourseMap = courseSchedules.stream().collect(Collectors.groupingBy(CourseSchedule::getMemberFlag));
 		//课程是否需要标记为云教练赠送
 		Boolean cloudTeacherPaymentFlag = false;
+		Long calenderId = null;
 		for (Integer memberFlag : memberCourseMap.keySet()) {
 			List<CourseSchedule> courseScheduleList = memberCourseMap.get(memberFlag);
 			if(courseScheduleList != null && courseScheduleList.size() > 0){
@@ -520,9 +521,9 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 									typeCourseDuration = 0;
 								}
 								//如果是免费的云教练课程
-								if(detail.getCloudTeacherPaymentFlag()){
+								if(detail.getCloudTeacherPaymentFlag() && !cloudTeacherPaymentFlag){
 									cloudTeacherPaymentFlag = true;
-									operatingReportCloudService.updateSet(detail.getMusicGroupPaymentCalenderId(),scheduleList.stream().map(e->e.getId()).collect(Collectors.toList()));
+									calenderId = detail.getMusicGroupPaymentCalenderId();
 								}
 							}
 							musicGroupPaymentStudentCourseDetailDao.batchUpdate(musicGroupPaymentStudentCourseDetails);
@@ -534,6 +535,7 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 		}
 		if(cloudTeacherPaymentFlag){
 			courseScheduleDao.markFreeCourse(courseSchedules.stream().map(e->e.getId().toString()).collect(Collectors.joining(",")));
+			operatingReportCloudService.updateSet(calenderId,courseSchedules.stream().map(e->e.getId()).collect(Collectors.toList()));
 		}
 	}
 

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

@@ -84,7 +84,7 @@ public class OperatingReportCloudServiceImpl extends BaseServiceImpl<Integer, Op
 		//计算课程预收
 		BigDecimal costPrice = organCourseTypeOriginalCostDao.getCourseCostPrice(StringUtils.join(scheduleIdList,","));
 		reportCloud.setCloudPrice(reportCloud.getCloudPrice().subtract(costPrice));
-		reportCloud.setCoursePrice(reportCloud.getCoursePrice().add(reportCloud.getCoursePrice()));
+		reportCloud.setCoursePrice(reportCloud.getCoursePrice().add(costPrice));
 		reportCloud.setUpdateTime(new Date());
 		operatingReportCloudDao.update(reportCloud);
 	}