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

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

@@ -935,6 +935,21 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		totalPrice=totalPrice.setScale(0,BigDecimal.ROUND_CEILING);
 		results.put("totalPrice",totalPrice);
 
+		Teacher teacher = teacherDao.get(teacherId);
+		if(!JobNatureEnum.FULL_TIME.equals(teacher.getJobNature())){
+			if(Objects.isNull(teacherDefaultVipGroupSalary)||Objects.isNull(teacherDefaultVipGroupSalary.getOnlineClassesSalary())){
+				results.put("onlineTeacherSalary", BigDecimal.ZERO);
+			}else{
+				results.put("onlineTeacherSalary", teacherDefaultVipGroupSalary.getOnlineClassesSalary());
+			}
+			if(Objects.isNull(teacherDefaultVipGroupSalary)||Objects.isNull(teacherDefaultVipGroupSalary.getOfflineClassesSalary())){
+				results.put("offlineTeacherSalary", BigDecimal.ZERO);
+			}else{
+				results.put("offlineTeacherSalary", teacherDefaultVipGroupSalary.getOfflineClassesSalary());
+			}
+			return results;
+		}
+
 		//教师课酬线上单课酬计算
 		if(Objects.nonNull(vipGroupSalarySettlementDto.getOnlineSalarySettlement())){
 			if(vipGroup instanceof VipGroupApplyBaseInfoDto&&!useDefaultTeacherSalary

mec-biz/src/main/resources/config/mybatis/StudentCourseHomeworkMapper.xml

@@ -243,7 +243,8 @@
 			#{courseScheduleID} course_schedule_id_,
 			sa.user_id_,
 			0 status_,
-			0 is_replied_
+			0 is_replied_,
+			0 is_replied_timely_
 		FROM
 			course_schedule_student_payment sa
 		WHERE