Browse Source

fix:课酬

Joburgess 4 years ago
parent
commit
309f4929c5

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

@@ -235,8 +235,8 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 int signCourseTimeBetween = signCourseTimeBetweenSeconds/60;
                 int signCourseTimeBetween = signCourseTimeBetweenSeconds/60;
                 if(signCourseTimeBetween<=1&&signCourseTimeBetween>-3){
                 if(signCourseTimeBetween<=1&&signCourseTimeBetween>-3){
                     //课程开始前1分钟至开始后3分钟进入教室
                     //课程开始前1分钟至开始后3分钟进入教室
-                    deductCost = deductCost.add(new BigDecimal(50));
-                    deductReasons.add("课程开始前1分钟至开始后3分钟进入教室扣除50元");
+                    deductCost = deductCost.add(courseScheduleTeacherSalary.getExpectSalary().divide(new BigDecimal(2)));
+                    deductReasons.add("课程开始前1分钟至开始后3分钟进入教室扣除一半课酬");
                 }else if(signCourseTimeBetween<-3){
                 }else if(signCourseTimeBetween<-3){
                     //课程开始后3分钟后进入教室
                     //课程开始后3分钟后进入教室
                     deductCost = deductCost.add(courseScheduleTeacherSalary.getExpectSalary());
                     deductCost = deductCost.add(courseScheduleTeacherSalary.getExpectSalary());
@@ -262,8 +262,8 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                     deductReasons.add("课程开始前20分钟至开始后3分钟退出教室扣除全部课酬");
                     deductReasons.add("课程开始前20分钟至开始后3分钟退出教室扣除全部课酬");
                 }else if(signOutCourseTimeBetween<=3&&signOutCourseTimeBetween>0){
                 }else if(signOutCourseTimeBetween<=3&&signOutCourseTimeBetween>0){
                     //课程结束前3分钟后至课程结束前退出教室
                     //课程结束前3分钟后至课程结束前退出教室
-                    deductCost = deductCost.add(new BigDecimal(50));
-                    deductReasons.add("课程结束前3分钟后至课程结束前退出教室扣除50元");
+                    deductCost = deductCost.add(courseScheduleTeacherSalary.getExpectSalary().divide(new BigDecimal(2)));
+                    deductReasons.add("课程结束前3分钟后至课程结束前退出教室扣除一半课酬");
                 }
                 }
             }
             }
 
 
@@ -348,8 +348,8 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 float signCourseTimeBetween = (float)signCourseTimeBetweenSeconds/(float)60;
                 float signCourseTimeBetween = (float)signCourseTimeBetweenSeconds/(float)60;
                 if(signCourseTimeBetween<=1&&signCourseTimeBetween>-3){
                 if(signCourseTimeBetween<=1&&signCourseTimeBetween>-3){
                     //课程开始前1分钟至开始后3分钟进入教室
                     //课程开始前1分钟至开始后3分钟进入教室
-                    deductCost = deductCost.add(new BigDecimal(50));
-                    deductReasons.add("课程开始前1分钟至开始后3分钟进入教室扣除50元");
+                    deductCost = deductCost.add(courseScheduleTeacherSalary.getExpectSalary().divide(new BigDecimal(2)));
+                    deductReasons.add("课程开始前1分钟至开始后3分钟进入教室扣除一半课酬");
                 }else if(signCourseTimeBetween<=-3){
                 }else if(signCourseTimeBetween<=-3){
                     //课程开始后3分钟后进入教室
                     //课程开始后3分钟后进入教室
                     deductCost = deductCost.add(courseScheduleTeacherSalary.getExpectSalary());
                     deductCost = deductCost.add(courseScheduleTeacherSalary.getExpectSalary());
@@ -381,8 +381,8 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                     deductReasons.add("课程开始前20分钟至开始后3分钟退出教室扣除全部课酬");
                     deductReasons.add("课程开始前20分钟至开始后3分钟退出教室扣除全部课酬");
                 }else if(signOutCourseTimeBetween<=3&&signOutCourseTimeBetween>0){
                 }else if(signOutCourseTimeBetween<=3&&signOutCourseTimeBetween>0){
                     //课程结束前3分钟后至课程结束前退出教室
                     //课程结束前3分钟后至课程结束前退出教室
-                    deductCost = deductCost.add(new BigDecimal(50));
-                    deductReasons.add("课程结束前3分钟后至课程结束前退出教室扣除50元");
+                    deductCost = deductCost.add(courseScheduleTeacherSalary.getExpectSalary().divide(new BigDecimal(2)));
+                    deductReasons.add("课程结束前3分钟后至课程结束前退出教室扣除一半课酬");
                 }
                 }
 
 
                 if(TeachModeEnum.OFFLINE.equals(courseScheduleTeacherSalary.getCourseSchedule().getTeachMode())){
                 if(TeachModeEnum.OFFLINE.equals(courseScheduleTeacherSalary.getCourseSchedule().getTeachMode())){
@@ -540,8 +540,8 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                     int signCourseTimeBetween = signCourseTimeBetweenSeconds/60;
                     int signCourseTimeBetween = signCourseTimeBetweenSeconds/60;
                     if(signCourseTimeBetween<=1&&signCourseTimeBetween>-3){
                     if(signCourseTimeBetween<=1&&signCourseTimeBetween>-3){
                         //课程开始前1分钟至开始后3分钟进入教室
                         //课程开始前1分钟至开始后3分钟进入教室
-                        deductCost = deductCost.add(new BigDecimal(50));
-                        deductReasons.add("课程开始前1分钟至开始后3分钟进入教室扣除50元");
+                        deductCost = deductCost.add(teacherSalary.divide(new BigDecimal(2)));
+                        deductReasons.add("课程开始前1分钟至开始后3分钟进入教室一半课酬");
                     }else if(signCourseTimeBetween<-3){
                     }else if(signCourseTimeBetween<-3){
                         //课程开始后3分钟后进入教室
                         //课程开始后3分钟后进入教室
                         deductCost = deductCost.add(courseScheduleTeacherSalary.getExpectSalary());
                         deductCost = deductCost.add(courseScheduleTeacherSalary.getExpectSalary());
@@ -567,8 +567,8 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                         deductReasons.add("课程开始前20分钟至开始后3分钟退出教室扣除全部课酬");
                         deductReasons.add("课程开始前20分钟至开始后3分钟退出教室扣除全部课酬");
                     }else if(signOutCourseTimeBetween<=3&&signOutCourseTimeBetween>0){
                     }else if(signOutCourseTimeBetween<=3&&signOutCourseTimeBetween>0){
                         //课程结束前3分钟后至课程结束前退出教室
                         //课程结束前3分钟后至课程结束前退出教室
-                        deductCost = deductCost.add(new BigDecimal(50));
-                        deductReasons.add("课程结束前3分钟后至课程结束前退出教室扣除50元");
+                        deductCost = deductCost.add(teacherSalary.divide(new BigDecimal(2)));
+                        deductReasons.add("课程结束前3分钟后至课程结束前退出教室扣除一半课酬");
                     }
                     }
                 }
                 }