Merge branch 'feature/0529-live' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -93,15 +93,13 @@ public class TeacherLeaveRecordServiceImpl extends BaseServiceImpl<Long, Teacher
 				List<CourseSchedule> list = new ArrayList<CourseSchedule>();
 
 				for (CoursesScheduleHistory his : coursesScheduleHistoryList) {
-					if (his.getBefore().getType() != CourseScheduleType.VIP && his.getBefore().getType() != CourseScheduleType.LIVE) {
-						continue;
-					}
-					if(!teacherLeaveRecord.getEndTime().before(his.getAfter().getStartClassTime())
-							&&!teacherLeaveRecord.getStartTime().after(his.getAfter().getEndClassTime())){
-						throw new BizException("课程时间与老师请假时间存在冲突");
+					if (his.getBefore().getType() == CourseScheduleType.VIP || his.getBefore().getType() == CourseScheduleType.LIVE) {
+						if(!teacherLeaveRecord.getEndTime().before(his.getAfter().getStartClassTime())
+								&&!teacherLeaveRecord.getStartTime().after(his.getAfter().getEndClassTime())){
+							throw new BizException("课程时间与老师请假时间存在冲突");
+						}
+						list.add(his.getAfter());
 					}
-
-					list.add(his.getAfter());
 				}
 			}
 		}

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

@@ -2335,6 +2335,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         if (!vipGroupCategory.getMusicTheory()) {
             gofts = gofts.divide(new BigDecimal(vipGroupCategory.getStudentNum()), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(normalStudentNum)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP);
             ofts = ofts.divide(new BigDecimal(vipGroupCategory.getStudentNum()), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(normalStudentNum)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP);
+        } else if("LIVE".equals(vipGroup.getGroupType())){
+            gofts = gofts.multiply(new BigDecimal(normalStudentNum)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP);
+            ofts = ofts.multiply(new BigDecimal(normalStudentNum)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP);
         }
         results.put("offlineTeacherSalary", ofts);
         results.put("giveOfflineTeacherSalary", gofts);