Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleDao.java

@@ -1456,5 +1456,5 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      * @param courseScheduleIds
      * @return
      */
-    List<Long> findNotStartCourseByIds(List<Long> courseScheduleIds);
+    List<Long> findNotStartCourseByIds(@Param("courseScheduleIds") List<Long> courseScheduleIds);
 }

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

@@ -201,17 +201,15 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
     public void practiceTeacherSalarySettlement() {
         int days = Integer.parseInt(sysConfigDao.findByParamName(SysConfigService.VIP_APPEAL_DAYS_RANGE).getParanValue());
         //获取教师未结算课程记录
+        Date now = new Date();
         List<CourseScheduleTeacherSalary> someDayAgoTeacherCourseSalaryNoSettlement = courseScheduleTeacherSalaryDao.findTeacherCourseSalaryNoSettlement(days,GroupType.PRACTICE.getCode());
-        if (CollectionUtils.isEmpty(someDayAgoTeacherCourseSalaryNoSettlement)) {
-            LOGGER.info("未获取到未结算课酬记录!");
-            return;
+        if (!CollectionUtils.isEmpty(someDayAgoTeacherCourseSalaryNoSettlement)) {
+            someDayAgoTeacherCourseSalaryNoSettlement.forEach(courseScheduleTeacherSalary -> {
+                courseScheduleTeacherSalary.setActualSalary(courseScheduleTeacherSalary.getExpectSalary());
+                courseScheduleTeacherSalary.setSettlementTime(now);
+                courseScheduleTeacherSalaryDao.update(courseScheduleTeacherSalary);
+            });
         }
-        Date now = new Date();
-        someDayAgoTeacherCourseSalaryNoSettlement.forEach(courseScheduleTeacherSalary -> {
-            courseScheduleTeacherSalary.setActualSalary(courseScheduleTeacherSalary.getExpectSalary());
-            courseScheduleTeacherSalary.setSettlementTime(now);
-            courseScheduleTeacherSalaryDao.update(courseScheduleTeacherSalary);
-        });
         //获取未转结的
         List<TeacherCourseReward> teacherCourseRewards = teacherCourseRewardService.findBySettlementStatus(0);
         if(teacherCourseRewards.size() > 0){
@@ -256,17 +254,18 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                             if(teacherAttendance == null){
                                 throw new BizException("教师签到记录不存在 : courseScheduleId:{}",s);
                             }
-                            if(teacherAttendance.getSignInStatus() != null && teacherAttendance.getSignInStatus() == YesOrNoEnum.NO){
-                                expectRewardAmount.subtract(multiply);
-                                memo.append("课程").append(s).append("异常签到");
+                            if(teacherAttendance.getSignInStatus() == null || teacherAttendance.getSignInStatus() == YesOrNoEnum.NO){
+                                expectRewardAmount = expectRewardAmount.subtract(multiply);
+                                memo.append("课程").append(s).append("异常签到;");
                             }
-                            if(teacherAttendance.getSignOutStatus() != null && teacherAttendance.getSignOutStatus() == YesOrNoEnum.NO){
-                                expectRewardAmount.subtract(multiply);
-                                memo.append("课程").append(s).append("异常签退");
+                            if(teacherAttendance.getSignOutStatus() == null || teacherAttendance.getSignOutStatus() == YesOrNoEnum.NO){
+                                expectRewardAmount = expectRewardAmount.subtract(multiply);
+                                memo.append("课程").append(s).append("异常签退;");
                             }
-                            add.add(expectRewardAmount);
+                            add = add.add(expectRewardAmount);
                             expectRewardAmount = e.getExpectRewardAmount().divide(new BigDecimal(split.length));
                         }
+                        e.setMemo(memo.toString());
                         e.setActualRewardAmount(add);
                         e.setSettlementStatus(YesOrNoEnum.YES);
                         e.setSettlementDate(now);

mec-biz/src/main/resources/config/mybatis/TeacherCourseRewardDao.xml

@@ -93,7 +93,7 @@
         where id_ = #{id,jdbcType=BIGINT}
     </update>
     <update id="batchUpdate">
-        <foreach collection="list" item="item" index="index" open="" close="" separator=";">
+        <foreach collection="teacherCourseRewards" item="item" index="index" open="" close="" separator=";">
             update teacher_course_reward
             <set>
                 <if test="item.actualRewardAmount != null">