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

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;
 

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

@@ -329,10 +329,8 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 			Set<Integer> teachers = rows.stream().map(e -> e.getId()).collect(Collectors.toSet());
 			String teacherIds = StringUtils.join(teachers, ",");
 			//获取小课数量
-//			List<Map<Integer,Long>> numList =  classGroupDao.countTeacherVipNum(teacherIds);
 			Map<Integer,Integer> vipNumMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(classGroupDao.countTeacherVipNum(teacherIds))),HashMap.class);
 			//获取试听课数量
-//			List<Map<Integer,Long>> demoNumList =  demoGroupDao.countTeacherDemoGroupNum(teacherIds);
 			Map<Integer,Integer> demoNumMap = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertIntegerMap(demoGroupDao.countTeacherDemoGroupNum(teacherIds))),HashMap.class);
 
 //			Set<Integer> organIds = rows.stream().map(e -> e.getOrganId()).collect(Collectors.toSet());

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_ ) <= DATE_ADD( NOW( ), INTERVAL - 7 DAY )
+		CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) <= DATE_ADD( NOW( ), INTERVAL - #{days} DAY )
 		AND cs.type_='VIP'
 		AND csts.settlement_time_ IS NULL
     </select>

mec-web/src/main/java/com/ym/mec/web/controller/StudentManageController.java

@@ -139,7 +139,7 @@ public class StudentManageController extends BaseController {
      */
     @GetMapping(value = "/queryUserByPhone")
     @PreAuthorize("@pcs.hasPermissions('studentManage/queryUserByPhone')")
-    public StudentRegistration queryUserByPhone(String mobile) {
-        return studentRegistrationService.queryUserByPhone(mobile);
+    public Object queryUserByPhone(String mobile) {
+        return succeed(studentRegistrationService.queryUserByPhone(mobile));
     }
 }