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

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

@@ -761,20 +761,15 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                     deductCost = deductCost.add(teacherSalary);
                 }
 
-                if(Objects.isNull(teacherAttendance.getSignOutStatus())||YesOrNoEnum.NO.equals(teacherAttendance.getSignOutStatus())){
-                    if(isCallName){
-                        //异常签退或者未签退，但是正常点名扣除50元课酬
-                        deductCost = deductCost.add(new BigDecimal(50));
-                    }else{
-                        //异常签退或者未签退, 且未点名扣除一半课酬
-                        deductCost = deductCost.add(teacherSalary.divide(new BigDecimal(2)));
-                    }
-                }
-
                 if(!isCallName){
                     //未点名扣除一半课酬
                     deductCost = deductCost.add(teacherSalary.divide(new BigDecimal(2)));
+                }else if((Objects.isNull(teacherAttendance.getSignOutStatus())||YesOrNoEnum.NO.equals(teacherAttendance.getSignOutStatus()))&&isCallName){
+                    //异常签退或者未签退，但是正常点名扣除50元课酬
+                    deductCost = deductCost.add(new BigDecimal(50));
                 }
+
+
             }
 
             BigDecimal finalSalary = teacherSalary.subtract(deductCost);