Joburgess 5 years ago
parent
commit
da9899dce9

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

@@ -211,12 +211,18 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         someDayAgoTeacherCourseSalaryNoSettlement.forEach(courseScheduleTeacherSalary -> {
             //获取当前课程学生缴费记录
             List<CourseScheduleStudentPayment> studentPaymentsWithCourse = studentPaymentGroupByCourse.get(courseScheduleTeacherSalary.getCourseScheduleId());
+
+            if(CollectionUtils.isEmpty(studentPaymentsWithCourse)){
+                return;
+            }
+
             //当前课程缴费学生数量
-            BigDecimal courseStudentNum = new BigDecimal(studentPaymentsWithCourse.size());
+            BigDecimal courseStudentNum=new BigDecimal(studentPaymentsWithCourse.size());
+
             //教师预计课酬
             BigDecimal expectSalary = courseScheduleTeacherSalary.getExpectSalary();
             //当前课程每个学生平均课酬
-            BigDecimal avgSalary = expectSalary.divide(courseStudentNum);
+            BigDecimal avgSalary = expectSalary.divide(courseStudentNum,6,BigDecimal.ROUND_DOWN);
             //教师当前课程责任总占比,当前课程应得课酬
             BigDecimal teacherLiabilityAllratio;
 

+ 1 - 1
mec-biz/src/main/resources/config/mybatis/CourseScheduleTeacherSalaryMapper.xml

@@ -214,7 +214,7 @@
 		course_schedule_teacher_salary csts
 		LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
 		WHERE
-		CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) &lt;= DATE_ADD( NOW( ), INTERVAL - 7 DAY )
+		CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) &lt;= DATE_ADD( NOW( ), INTERVAL - #{days} DAY )
 		AND cs.type_='VIP'
 		AND csts.settlement_time_ IS NULL
     </select>