feat:不结算课酬的老师课酬实际结算时为0

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

@@ -264,6 +264,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 courseScheduleTeacherSalary.setDeductionReason("不结算课酬");
 
                 courseScheduleTeacherSalary.setActualSalary(BigDecimal.ZERO);
+                courseScheduleTeacherSalary.setSubsidy(BigDecimal.ZERO);
                 courseScheduleTeacherSalary.setSettlementTime(now);
                 courseScheduleTeacherSalaryDao.update(courseScheduleTeacherSalary);
                 return;
@@ -403,6 +404,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 courseScheduleTeacherSalary.setDeductionReason("不结算课酬");
 
                 courseScheduleTeacherSalary.setActualSalary(BigDecimal.ZERO);
+                courseScheduleTeacherSalary.setSubsidy(BigDecimal.ZERO);
                 courseScheduleTeacherSalary.setSettlementTime(now);
                 courseScheduleTeacherSalaryDao.update(courseScheduleTeacherSalary);
                 return;
@@ -592,6 +594,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 courseScheduleTeacherSalary.setDeductionReason("不结算课酬");
 
                 courseScheduleTeacherSalary.setActualSalary(BigDecimal.ZERO);
+                courseScheduleTeacherSalary.setSubsidy(BigDecimal.ZERO);
                 courseScheduleTeacherSalary.setSettlementTime(now);
                 courseScheduleTeacherSalaryDao.update(courseScheduleTeacherSalary);
                 continue;
@@ -1585,9 +1588,8 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
     public void calMusicCourseTeacherActualSalary(CourseSchedule courseSchedule, CourseScheduleTeacherSalary courseScheduleTeacherSalary,
                                                   List<TeacherAttendance> teacherAttendances, School school, Teacher teacher, double attendanceRange) {
 
-        if(Objects.isNull(teacher)||(Objects.nonNull(teacher.getIsSettlementSalary())&&!teacher.getIsSettlementSalary())){
-            courseScheduleTeacherSalary.setSubsidy(BigDecimal.ZERO);
-            courseScheduleTeacherSalary.setActualSalary(BigDecimal.ZERO);
+        if(StringUtils.isNotBlank(courseScheduleTeacherSalary.getDeductionReason())&&"不结算课酬".equals(courseScheduleTeacherSalary.getDeductionReason())){
+            //不结算课酬
             return;
         }
 
@@ -1821,10 +1823,9 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
     public void calVipCourseTeacherActualSalary(CourseSchedule courseSchedule, CourseScheduleTeacherSalary courseScheduleTeacherSalary,
                                                 List<TeacherAttendance> teacherAttendances, School school, Teacher teacher, double attendanceRange) {
         List<TeacherSalaryDeductReasonDto> deductReasons = new ArrayList<>();
-        
-        if(Objects.isNull(teacher)||(Objects.nonNull(teacher.getIsSettlementSalary())&&!teacher.getIsSettlementSalary())){
-            courseScheduleTeacherSalary.setSubsidy(BigDecimal.ZERO);
-            courseScheduleTeacherSalary.setActualSalary(BigDecimal.ZERO);
+
+        if(StringUtils.isNotBlank(courseScheduleTeacherSalary.getDeductionReason())&&"不结算课酬".equals(courseScheduleTeacherSalary.getDeductionReason())){
+            //不结算课酬
             return;
         }
         
@@ -1930,9 +1931,8 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                                                List<TeacherAttendance> teacherAttendances, School school, Teacher teacher) {
         List<TeacherSalaryDeductReasonDto> deductReasons = new ArrayList<>();
 
-        if(Objects.isNull(teacher)||(Objects.nonNull(teacher.getIsSettlementSalary())&&!teacher.getIsSettlementSalary())){
-            courseScheduleTeacherSalary.setSubsidy(BigDecimal.ZERO);
-            courseScheduleTeacherSalary.setActualSalary(BigDecimal.ZERO);
+        if(StringUtils.isNotBlank(courseScheduleTeacherSalary.getDeductionReason())&&"不结算课酬".equals(courseScheduleTeacherSalary.getDeductionReason())){
+            //不结算课酬
             return;
         }