style:删除无用代码

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

@@ -506,7 +506,6 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         Date date = DateUtil.addMonths(now, -1);
         String startDate = DateUtil.format(DateUtil.getFirstDayOfMonth(date),DateUtil.DEFAULT_PATTERN);
         String endDate = DateUtil.format(DateUtil.getLastDayOfMonth(date),DateUtil.DEFAULT_PATTERN);
-//        Date settleTime = DateUtil.addDays1(now, -sysConfigDao.findByParamName(SysConfigService.MUSIC_GROUP_SETTLEMENT_DAY).getParanValue(Integer.class));
         Integer settlementClassMinutes = Integer.parseInt(sysConfigDao.findByParamName(SysConfigService.MUSIC_GROUP_SETTLEMENT_CLASS_MINUTES).getParanValue());
         Integer singleClassTime = Integer.parseInt(sysConfigDao.findByParamName(SysConfigService.MUSIC_GROUP_SETTLEMENT_SINGLE_CLASS_MINUTES).getParanValue());
         Date entryDate = DateUtil.stringToDate(sysConfigDao.findByParamName(SysConfigService.TEACHER_ENTRY_DATE).getParanValue(),"yyyy-MM-dd");
@@ -608,15 +607,8 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             }
             teacherClassMinutesMap.put(teacherId, schoolClassMinutesMap);
         });
-        //用户账户自己变动信息列表
-//        List<SysUserCashAccountDetail> userCashAccountDetails = new ArrayList<>();
         //计算课酬
         for (CourseScheduleTeacherSalary courseScheduleTeacherSalary : courseScheduleTeacherSalaries) {
-            /*TeacherAttendance teacherAttendanceInfo = teacherAttendanceDao.findByTeacherAttendanceInfo(courseScheduleTeacherSalary.getUserId().longValue(), courseScheduleTeacherSalary.getCourseScheduleId());
-            if(Objects.isNull(teacherAttendanceInfo)
-                ||(Objects.isNull(teacherAttendanceInfo.getSignInTime())&&Objects.isNull(teacherAttendanceInfo.getSignOutTime()))){
-                return;
-            }*/
             boolean durationIsChange = false;
             //当前课酬对应的课程信息
             CourseSchedule courseSchedule = courseScheduleIdMap.get(courseScheduleTeacherSalary.getCourseScheduleId());
@@ -719,7 +711,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                     teacherSalary = BigDecimal.ZERO;
                 }
             }else{
-                teacherSalary=courseScheduleTeacherSalary.getTeacherActualSalary();
+                teacherSalary=courseScheduleTeacherSalary.getExpectSalary();
             }
 
             BigDecimal subsidy = courseSubsidyMap.get(courseSchedule.getSchoolId());
@@ -731,21 +723,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             courseScheduleTeacherSalary.setActualSalary(teacherSalary);
             courseScheduleTeacherSalary.setSettlementTime(now);
             courseScheduleTeacherSalaryDao.update(courseScheduleTeacherSalary);
-
-            //生成教师账户资金变动记录
-//            sysUserCashAccountService.updateBalance(courseScheduleTeacherSalary.getUserId(), teacherSalary);
-//            SysUserCashAccount teacherCashAccount = sysUserCashAccountService.get(courseScheduleTeacherSalary.getUserId().intValue());
-//            SysUserCashAccountDetail teacherCashAccountDetail = new SysUserCashAccountDetail();
-//            teacherCashAccountDetail.setUserId(courseScheduleTeacherSalary.getUserId());
-//            teacherCashAccountDetail.setType(PlatformCashAccountDetailTypeEnum.WAGE);
-//            teacherCashAccountDetail.setStatus(DealStatusEnum.SUCCESS);
-//            teacherCashAccountDetail.setAmount(teacherSalary);
-//            teacherCashAccountDetail.setBalance(teacherCashAccount.getBalance());
-//            teacherCashAccountDetail.setAttribute(courseScheduleTeacherSalary.getCourseScheduleId().toString());
-//            userCashAccountDetails.add(teacherCashAccountDetail);
-
         }
-//        sysUserCashAccountDetailDao.batchInsert(userCashAccountDetails);
     }
 
     @Override