Browse Source

feat:VIP课课酬由班级人数改为课程预计上课人数

Joburgess 4 years ago
parent
commit
b5afa08e16

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

@@ -795,13 +795,6 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         BigDecimal onlineTeacherSalary=BigDecimal.ZERO,
         BigDecimal onlineTeacherSalary=BigDecimal.ZERO,
                 offlineTeacherSalary=BigDecimal.ZERO;
                 offlineTeacherSalary=BigDecimal.ZERO;
 
 
-        Map<String, BigDecimal> salary = vipGroupService.countVipGroupPredictFee(vipGroup, vipGroup.getUserId(), null);
-
-        if(Objects.nonNull(salary)){
-            onlineTeacherSalary=salary.get("onlineTeacherSalary");
-            offlineTeacherSalary=salary.get("offlineTeacherSalary");
-        }
-
         List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries = courseScheduleTeacherSalaryDao.findByGroupWithNotStart(vipGroupId.toString(), GroupType.VIP.getCode());
         List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries = courseScheduleTeacherSalaryDao.findByGroupWithNotStart(vipGroupId.toString(), GroupType.VIP.getCode());
         if(!CollectionUtils.isEmpty(courseScheduleTeacherSalaries)){
         if(!CollectionUtils.isEmpty(courseScheduleTeacherSalaries)){
             List<Long> courseIds = courseScheduleTeacherSalaries.stream().map(CourseScheduleTeacherSalary::getCourseScheduleId).collect(Collectors.toList());
             List<Long> courseIds = courseScheduleTeacherSalaries.stream().map(CourseScheduleTeacherSalary::getCourseScheduleId).collect(Collectors.toList());
@@ -809,6 +802,14 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             Map<Integer, String> coureTeachModeMap = MapUtil.convertIntegerMap(teachModeById);
             Map<Integer, String> coureTeachModeMap = MapUtil.convertIntegerMap(teachModeById);
             for(int i=0;i<courseScheduleTeacherSalaries.size();i++){
             for(int i=0;i<courseScheduleTeacherSalaries.size();i++){
                 String courseType = coureTeachModeMap.get(courseScheduleTeacherSalaries.get(i).getCourseScheduleId());
                 String courseType = coureTeachModeMap.get(courseScheduleTeacherSalaries.get(i).getCourseScheduleId());
+
+                Map<String, BigDecimal> salary = vipGroupService.countVipGroupPredictFee(vipGroup, vipGroup.getUserId(), courseScheduleTeacherSalaries.get(i).getCourseScheduleId());
+
+                if(Objects.nonNull(salary)){
+                    onlineTeacherSalary=salary.get("onlineTeacherSalary");
+                    offlineTeacherSalary=salary.get("offlineTeacherSalary");
+                }
+
                 if(courseType.equals(TeachModeEnum.ONLINE.getCode())){
                 if(courseType.equals(TeachModeEnum.ONLINE.getCode())){
                     courseScheduleTeacherSalaries.get(i).setExpectSalary(onlineTeacherSalary);
                     courseScheduleTeacherSalaries.get(i).setExpectSalary(onlineTeacherSalary);
                 }else if(courseType.equals(TeachModeEnum.OFFLINE.getCode())){
                 }else if(courseType.equals(TeachModeEnum.OFFLINE.getCode())){