Merge branch 'feature/1113-vipCourse' of http://git.dayaedu.com/yonge/cooleshow into feature/1113-vipCourse

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherCourseScheduleController.java

@@ -100,7 +100,7 @@ public class TeacherCourseScheduleController extends BaseController {
     @PostMapping("/queryTeacherPracticeCourse")
     public HttpResponseResult<PageInfo<MyCourseVo>> queryTeacherPracticeCourse(@RequestBody MyCourseSearch search) {
         search.setTeacherId(sysUserService.getUserId());
-        search.setCourseType(null);
+        search.setCourseType("VIP,PRACTICE");
         IPage<MyCourseVo> pages = courseScheduleService.queryTeacherPracticeCourse(PageUtil.getPage(search), search);
         return succeed(PageUtil.pageInfo(pages));
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseScheduleServiceImpl.java

@@ -144,6 +144,9 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
 
     @Autowired
     private StudentAttendanceService studentAttendanceService;
+
+    @Autowired
+    private TeacherAttendanceService teacherAttendanceService;
     @Autowired
     private SubjectService subjectService;
 
@@ -2834,7 +2837,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
         }
         if(query.getAttendanceStatus() != null){
             List<Long> courseIds = courseSchedules.stream().map(CourseSchedule::getId).collect(Collectors.toList());
-            List<StudentAttendance> list = studentAttendanceService.lambdaQuery().in(StudentAttendance::getCourseScheduleId, courseIds).list();
+            List<TeacherAttendance> list = teacherAttendanceService.lambdaQuery().in(TeacherAttendance::getCourseScheduleId, courseIds).list();
             if(query.getAttendanceStatus()){
                 if (CollectionUtils.isEmpty(list)) {
                     return Lists.newArrayList();
@@ -2861,9 +2864,9 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
         }
         //获取所有学生信息
         List<Long> studentIds = studentPayments.stream().map(CourseScheduleStudentPayment::getUserId).collect(Collectors.toList());
-        List<StudentAttendance> attendanceList = Lists.newArrayList();
+        List<TeacherAttendance> attendanceList = Lists.newArrayList();
         if(query.getAttendanceStatus() == null){
-            attendanceList = studentAttendanceService.lambdaQuery().in(StudentAttendance::getCourseScheduleId, courseScheduleIds).list();
+            attendanceList = teacherAttendanceService.lambdaQuery().in(TeacherAttendance::getCourseScheduleId, courseScheduleIds).list();
         }
         Map<Long, com.yonge.cooleshow.biz.dal.entity.SysUser> userMap = sysUserService.getMapByIds(studentIds);
         List<CourseScheduleWrapper.MyCourseVo> courseVos = Lists.newArrayList();
@@ -2918,7 +2921,9 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
         }
 
         if(query.getAttendanceStatus() != null){
-            List<StudentAttendance> list = studentAttendanceService.lambdaQuery().in(StudentAttendance::getCourseScheduleId, courseIds).list();
+            List<StudentAttendance> list = studentAttendanceService.lambdaQuery()
+                    .eq(StudentAttendance::getStudentId, query.getStudentId())
+                    .in(StudentAttendance::getCourseScheduleId, courseIds).list();
             if(query.getAttendanceStatus()){
                 if (CollectionUtils.isEmpty(list)) {
                     return Lists.newArrayList();
@@ -2953,7 +2958,9 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
         List<Long> courseScheduleIds = courseSchedules.stream().map(CourseSchedule::getId).collect(Collectors.toList());
         Map<Long,Boolean> attendanceMap = new HashMap<>();
         if(query.getAttendanceStatus() == null){
-            List<StudentAttendance> attendanceList = studentAttendanceService.lambdaQuery().in(StudentAttendance::getCourseScheduleId, courseScheduleIds).list();
+            List<StudentAttendance> attendanceList = studentAttendanceService.lambdaQuery()
+                    .eq(StudentAttendance::getStudentId, query.getStudentId())
+                    .in(StudentAttendance::getCourseScheduleId, courseScheduleIds).list();
             attendanceMap = attendanceList.stream().collect(Collectors.toMap(StudentAttendance::getCourseScheduleId,studentAttendance -> true));
         }
         //获取所有老师
@@ -3000,6 +3007,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
                 .eq(CourseSchedule::getPushStartMsg, false)
                 .eq(CourseSchedule::getLock, 0)
                 .lt(CourseSchedule::getStartTime, DateUtil.offsetMinute(new Date(), 21))
+                .ge(CourseSchedule::getStartTime, DateUtil.offsetMinute(new Date(), 20))
                 .list();
         if (CollectionUtils.isEmpty(courseSchedules)) {
             return;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MemberPriceSettingsServiceImpl.java

@@ -709,8 +709,14 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti
             if (clientEnum == ClientEnum.TEACHER) {
                 messageTypeEnum= MessageTypeEnum.NEW_TEACHER_VIP_BUY_SUCCESS;
             }
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, messageTypeEnum,
-                    receivers, null, 0, null, clientEnum.getCode(), param1);
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,
+                    messageTypeEnum,
+                    receivers,
+                    null,
+                    0,
+                    null,
+                    clientEnum.getCode(),
+                    param1);
         } catch (Exception e) {
             log.error("会员购买极光消息推送异常,userId={}", userId);
         }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherAuthEntryRecordServiceImpl.java

@@ -242,8 +242,13 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
         if (isPass) {
             try {
 //                String url = sysMessageService.selectConfigUrl(MessageTypeEnum.TEACHER_AUTH_PASS.getCode());
-                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.TEACHER_AUTH_PASS,
-                        receivers, null, 0, null, ClientEnum.TEACHER.getCode());
+                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,
+                        MessageTypeEnum.TEACHER_AUTH_PASS,
+                        receivers,
+                        null,
+                        0,
+                        null,
+                        ClientEnum.TEACHER.getCode());
             } catch (Exception e) {
                 log.error("入驻审核极光消息推送异常,userId={}", userId);
             }

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -223,7 +223,7 @@
         WHERE p.course_id_ IN
         (SELECT s.id_ FROM course_schedule s WHERE lock_=0 AND s.teacher_id_=#{param.teacherId}
         <if test="param.courseType != null and param.courseType != ''">
-            AND s.type_ = #{param.courseType}
+            AND FIND_IN_SET(s.type_,#{param.courseType})
         </if>)
         <if test="param.status !=null and param.status !=''">
             AND cs.status_ = #{param.status}
@@ -1044,7 +1044,7 @@
     <select id="countStudentOverCourse" resultType="java.lang.Integer">
         select COUNT(DISTINCT cssp.course_id_) from course_schedule_student_payment cssp
         left join course_schedule cs ON cs.id_ = cssp.course_id_
-        where cs.start_time_ BETWEEN #{monday} AND #{sunday} AND cssp.user_id_ = #{userId}
+        where cs.class_date_ BETWEEN #{monday} AND #{sunday} AND cssp.user_id_ = #{userId}
         <if test="courseStatus != null and courseStatus != ''">
             AND FIND_IN_SET(cs.status_,#{courseStatus})
         </if>