Merge remote-tracking branch 'origin/master'

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

@@ -84,6 +84,7 @@ public class CourseRepliedServiceImpl extends ServiceImpl<CourseScheduleRepliedD
             isPayment(studentId, scheduleId);
             replied.setScore(null);
             replied.setStudentReplied(null);
+            replied.setTeacherRepliedTime(new Date());
             if (!repliedIsNull(replied)) {
                 repliedDao.updateReplied(replied);
                 return;
@@ -96,6 +97,7 @@ public class CourseRepliedServiceImpl extends ServiceImpl<CourseScheduleRepliedD
         isPayment(userId, scheduleId);
         replied.setStudentId(userId);
         replied.setTeacherReplied(null);
+        replied.setStudentRepliedTime(new Date());
         if (!repliedIsNull(replied)) {
             repliedDao.updateReplied(replied);
             return;

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

@@ -1271,7 +1271,8 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
                 .eq(TeacherFreeTime::getDefaultFlag, 1));
 
         if (teacherFreeTime==null){
-            throw new BizException("未查到老师陪练课配置");
+            log.info("未查到陪练课配置,老师id:{}",teacherId);
+            return new ArrayList<>();
         }
 
         if ((teacherFreeTime.getMonday() == null || teacherFreeTime.getMonday().equals("[]")) &&

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

@@ -459,7 +459,8 @@
             b.name_ AS subjectName,
             ig.id_ AS imGroupId,
             (r.student_replied_ IS NOT NULL) AS studentReplied,
-            (r.teacher_replied_ IS NOT NULL) AS teacherReplied
+            (r.teacher_replied_ IS NOT NULL) AS teacherReplied,
+            1 AS payCount
         FROM course_schedule s
         LEFT JOIN sys_user u ON s.teacher_id_ = u.id_
         LEFT JOIN course_group g ON s.course_group_id_ = g.id_
@@ -488,12 +489,14 @@
             sb.name_ AS subjectName,
             ig.id_ AS imGroupId,
             (r.student_replied_ IS NOT NULL) AS studentReplied,
-            (r.teacher_replied_ IS NOT NULL) AS teacherReplied
+            (r.teacher_replied_ IS NOT NULL) AS teacherReplied,
+            IFNULL(a.payCount,0) AS payCount
         FROM course_schedule s
         LEFT JOIN course_group g ON s.course_group_id_ = g.id_
         LEFT JOIN `subject` sb ON g.subject_id_=sb.id_
         LEFT JOIN course_schedule_replied r ON s.id_ = r.course_schedule_id_
         LEFT JOIN im_group ig ON ig.course_group_id_ = g.id_
+        LEFT JOIN (SELECT course_id_,COUNT(1) AS payCount FROM course_schedule_student_payment GROUP BY course_id_) a ON s.id_=a.course_id_
         WHERE s.lock_=0
         AND s.status_ IN ('ING','NOT_START','COMPLETE')
         AND s.id_ IN

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

@@ -107,6 +107,8 @@
             <if test="score !=null">score_ = #{score},</if>
             <if test="studentReplied !=null and studentReplied !=''">student_replied_ = #{studentReplied},</if>
             <if test="teacherReplied !=null and teacherReplied !=''">teacher_replied_ = #{teacherReplied},</if>
+            <if test="studentRepliedTime !=null">student_replied_time_ = #{studentRepliedTime},</if>
+            <if test="teacherRepliedTime !=null">teacher_replied_time_ = #{teacherRepliedTime},</if>
             update_time_ = SYSDATE()
         </set>
         WHERE student_id_ = #{studentId}

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

@@ -18,11 +18,11 @@
 
     <insert id="insertBatch" keyColumn="id_" keyProperty="id" useGeneratedKeys="true"
             parameterType="com.yonge.cooleshow.biz.dal.entity.ImGroupMember">
-        insert into im_group_member(group_id_, user_id_, nickname_, is_admin_, role_type_, create_time_,
+        insert into im_group_member(group_id_, user_id_,avatar_, nickname_, is_admin_, role_type_, create_time_,
         update_time_)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.groupId}, #{entity.userId}, #{entity.nickname}, #{entity.isAdmin}, #{entity.roleType},NOW(), NOW())
+            (#{entity.groupId}, #{entity.userId}, #{entity.avatar}, #{entity.nickname}, #{entity.isAdmin}, #{entity.roleType},NOW(), NOW())
         </foreach>
         ON DUPLICATE KEY UPDATE
         user_id_ = VALUES(user_id_),