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

mec-biz/src/main/java/com/ym/mec/biz/service/CourseScheduleService.java

@@ -149,15 +149,6 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
     void checkNewCourseSchedules(List<CourseSchedule> courseSchedules);
 
     /**
-     * @describe 检测数据库中存在的课程调整后是否存在错误
-     * @author Joburgess
-     * @date 2019/10/31
-     * @param courseSchedules: 课程列表
-     * @return void
-     */
-    void checkOldCourseSchedules(List<CourseSchedule> courseSchedules);
-
-    /**
      * 获取班级未开始的课程计划
      *
      * @param classGroupTeacherMapperList

mec-biz/src/main/java/com/ym/mec/biz/service/VipGroupService.java

@@ -109,10 +109,11 @@ public interface VipGroupService extends BaseService<Long, VipGroup> {
      * @return java.util.Map
      */
     <K extends VipGroup> Map countVipGroupPredictFee(K vipGroup,
-                                Integer teacherId,
-                                BigDecimal onlineClassesUnitPrice,
-                                BigDecimal offlineClassesUnitPrice,
-                                boolean computeTotalPrice);
+                                                     Integer teacherId,
+                                                     BigDecimal onlineClassesUnitPrice,
+                                                     BigDecimal offlineClassesUnitPrice,
+                                                     boolean computeTotalPrice,
+                                                     boolean useDefaultTeacherSalary);
 
     /**
      * @Author: Joburgess

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

@@ -293,9 +293,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				if(backCourseSchedule.getStartClassTime().before(preCourseSchedule.getEndClassTime())){
 					//提示信息
 					StringBuffer errInfo = new StringBuffer("在");
-					errInfo.append(DateUtil.dateToString(preCourseSchedule.getStartClassTime(),DateUtil.ISO_EXPANDED_DATE_TIME_FORMAT));
+					errInfo.append(DateUtil.dateToString(preCourseSchedule.getStartClassTime(),DateUtil.EXPANDED_DATE_TIME_FORMAT));
 					errInfo.append("至");
-					errInfo.append(DateUtil.dateToString(backCourseSchedule.getEndClassTime(),DateUtil.ISO_EXPANDED_DATE_TIME_FORMAT));
+					errInfo.append(DateUtil.dateToString(backCourseSchedule.getEndClassTime(),DateUtil.EXPANDED_DATE_TIME_FORMAT));
 					errInfo.append("时间段内");
 					//如果存在时间重叠，则需要判断前后两节课的教师和学生是否存在冲突
 					//教师冲突检测
@@ -337,11 +337,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		}
 	}
 
-	@Override
-	public void checkOldCourseSchedules(List<CourseSchedule> courseSchedules) {
-
-	}
-
 	/**
 	 * 判断课程安排中是否存在冲突
 	 * 计算课程课次

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

@@ -81,6 +81,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
 						courseSchedules.get(i).getActualTeacherId().intValue(),
 						onlineTeacherSalary,
 						offlineTeacherSalary,
+						false,
 						false);
 
 				if(vipGroupActivity.getType()== VipGroupActivityTypeEnum.GIVE_CLASS

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

@@ -518,7 +518,18 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
     @Override
     public List<StudentRegistration> findMusicGroupNoClassGroupStudent(String musicGroupId, Integer actualSubjectId) {
-        return studentRegistrationDao.findMusicGroupNoClassGroupStudent(musicGroupId, actualSubjectId);
+        //获取所有声部
+        List<Subject> subjectList = subjectService.findAll(new HashMap<>());
+        List<StudentRegistration> classGroupStuList = studentRegistrationDao.findMusicGroupNoClassGroupStudent(musicGroupId, actualSubjectId);
+        for (StudentRegistration studentRegistration : classGroupStuList) {
+            for (Subject subject : subjectList) {
+                if (studentRegistration.getActualSubjectId().equals(subject.getId())) {
+                    studentRegistration.setSubjectName(subject.getName());
+                    break;
+                }
+            }
+        }
+        return classGroupStuList;
     }
 
     @Override

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

@@ -169,6 +169,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				vipGroupApplyBaseInfoDto.getUserId(),
 				vipGroupApplyBaseInfoDto.getOnlineClassesUnitPrice(),
 				vipGroupApplyBaseInfoDto.getOfflineClassesUnitPrice(),
+				true,
 				true);
 
 		//如果默认课酬与实际课酬不匹配则需要审批
@@ -504,10 +505,11 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
     @Override
     public <K extends VipGroup> Map<String,BigDecimal> countVipGroupPredictFee(K vipGroup,
-														  Integer teacherId,
-														  BigDecimal onlineClassesUnitPrice,
-														  BigDecimal offlineClassesUnitPrice,
-														  boolean computeTotalPrice){
+																			   Integer teacherId,
+																			   BigDecimal onlineClassesUnitPrice,
+																			   BigDecimal offlineClassesUnitPrice,
+																			   boolean computeTotalPrice,
+																			   boolean useDefaultTeacherSalary){
 
 		if(Objects.isNull(teacherId)){
 			throw new BizException("请指定教师");
@@ -557,7 +559,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		if(Objects.nonNull(vipGroupSalarySettlementDto.getOnlineSalarySettlement())){
 			switch (vipGroupSalarySettlementDto.getOnlineSalarySettlement().getSalarySettlementType()){
 				case TEACHER_DEFAULT:
-					if(vipGroup instanceof VipGroupApplyBaseInfoDto){
+					if(vipGroup instanceof VipGroupApplyBaseInfoDto&&!useDefaultTeacherSalary){
 						teacherOnlineSalary=((VipGroupApplyBaseInfoDto) vipGroup).getOnlineTeacherSalary();
 					}
 
@@ -585,7 +587,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		if(Objects.nonNull(vipGroupSalarySettlementDto.getOfflineSalarySettlement())){
 			switch (vipGroupSalarySettlementDto.getOfflineSalarySettlement().getSalarySettlementType()){
 				case TEACHER_DEFAULT:
-					if(vipGroup instanceof VipGroupApplyBaseInfoDto){
+					if(vipGroup instanceof VipGroupApplyBaseInfoDto&&!useDefaultTeacherSalary){
 						teacherOfflineSalary=((VipGroupApplyBaseInfoDto) vipGroup).getOfflineTeacherSalary();
 					}
 					if(Objects.isNull(teacherOfflineSalary)){
@@ -805,7 +807,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		studentApplyRefunds.setExpectAmount(countVipGroupPredictFee(vipGroup,
 				vipGroup.getUserId(),
 				new BigDecimal(surplusClassTimes.get(TeachModeEnum.ONLINE.getCode()).toString()),
-				new BigDecimal(surplusClassTimes.get(TeachModeEnum.OFFLINE.getCode()).toString()),true).get("totalPrice"));
+				new BigDecimal(surplusClassTimes.get(TeachModeEnum.OFFLINE.getCode()).toString()),
+				true,
+				false).get("totalPrice"));
 		studentApplyRefunds.setStatus(AuditStatusEnum.ING);
 		String orderNo=StringUtils.join(new String[]{studentId.toString(),String.valueOf(System.currentTimeMillis())});
 		studentApplyRefunds.setOrderNo(orderNo);

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

@@ -175,7 +175,10 @@
                 music_group_id_ = #{musicGroupId},
             </if>
             <if test="actualSubjectId != null">
-                actual_subject_id_ = #{actualSubjectId},
+            actual_subject_id_ = #{actualSubjectId},
+            </if>
+            <if test="actualSubjectId != null">
+                class_group_id_ = #{classGroupId},
             </if>
         </set>
         WHERE id_ = #{id}

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupManageController.java

@@ -123,7 +123,8 @@ public class VipGroupManageController extends BaseController {
                 vipGroup.getUserId(),
                 vipGroup.getOnlineClassesUnitPrice(),
                 vipGroup.getOfflineClassesUnitPrice(),
-                true);
+                true,
+                false);
         return succeed(results);
     }