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

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

@@ -1048,6 +1048,10 @@ public class ActivityUserMapperServiceImpl extends BaseServiceImpl<Integer, Acti
 
 	@Override
 	public void subCourseConvert(List<CourseScheduleStudentPayment> studentPayments, Integer studentId, Integer singleClassMinutes,Integer categoryId) {
+		studentPayments = studentPayments.stream().filter(e->e.getActualPrice().compareTo(ZERO) > 0).collect(Collectors.toList());
+		if(CollectionUtils.isEmpty(studentPayments)){
+			return;
+		}
 		ActivityUserMapper activityUserMapper = new ActivityUserMapper();
 		activityUserMapper.setReturnFee(false);
 		activityUserMapper.setSingleCourseTime(singleClassMinutes);