Merge branch 'zx_online_update_1218' of http://git.dayaedu.com/yonge/cooleshow into feature/1219_opt

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

@@ -566,6 +566,8 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
         List<CourseScheduleStudentPayment> studentPayments = courseScheduleStudentPaymentService.lambdaQuery()
                 .eq(CourseScheduleStudentPayment::getCourseGroupId, groupId)
                 .isNotNull(CourseScheduleStudentPayment::getUserId)
+                .groupBy(CourseScheduleStudentPayment::getUserId)
+                .orderByDesc(CourseScheduleStudentPayment::getId)
                 .list();
         if (CollectionUtils.isNotEmpty(studentPayments)) {
             List<Long> userIds = studentPayments.stream().map(CourseScheduleStudentPayment::getUserId).distinct().collect(Collectors.toList());
@@ -573,14 +575,14 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
             //获取用户声部列表
             Map<Long, com.yonge.cooleshow.biz.dal.entity.SysUser> mapByIds = sysUserService.getMapByIds(userIds);
             List<CourseGroupWrapper.CourseStudentVo> result = new ArrayList<>();
-            userIds.forEach(e -> {
+            studentPayments.forEach(e -> {
                 CourseGroupWrapper.CourseStudentVo vo = new CourseGroupWrapper.CourseStudentVo();
-                vo.setStudentId(e);
-                com.yonge.cooleshow.biz.dal.entity.SysUser sysUser = mapByIds.get(e);
+                vo.setStudentId(e.getUserId());
+                com.yonge.cooleshow.biz.dal.entity.SysUser sysUser = mapByIds.get(e.getUserId());
                 vo.setStudentName(sysUser.getRealName());
                 vo.setUserName(sysUser.getUsername());
                 vo.setAvatar(sysUser.getAvatar());
-                vo.setSubjectId(studentMap.get(e).getSubjectId());
+                vo.setSubjectId(studentMap.get(e.getUserId()).getSubjectId());
                 if(StringUtils.isNotEmpty(vo.getSubjectId())){
                     List<Subject> subjectList = subjectService.findBySubjectByIdList(vo.getSubjectId());
                     if(CollectionUtils.isNotEmpty(subjectList)){

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

@@ -3077,7 +3077,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
         //距离开课时间小于等于20分钟
         List<CourseSchedule> courseSchedules = this.lambdaQuery()
                 .eq(CourseSchedule::getStatus, CourseScheduleEnum.NOT_START.getCode())
-                .in(CourseSchedule::getType, CourseScheduleEnum.PRACTICE.getCode(), CourseScheduleEnum.VIP.getCode())
+                .in(CourseSchedule::getType, CourseScheduleEnum.PRACTICE.getCode(), CourseScheduleEnum.VIP.getCode(), CourseScheduleEnum.GROUP.getCode())
                 .eq(CourseSchedule::getPushStartMsg, false)
                 .eq(CourseSchedule::getLock, 0)
                 .lt(CourseSchedule::getStartTime, DateUtil.offsetMinute(new Date(), 21))
@@ -3102,6 +3102,8 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
                 sendStartRemind(CourseScheduleEnum.PRACTICE,sendTeacherMap,courseList);
             }else if(CourseScheduleEnum.VIP.getCode().equals(type)){
                 sendStartRemind(CourseScheduleEnum.VIP,sendTeacherMap,courseList);
+            }else if(CourseScheduleEnum.GROUP.getCode().equals(type)){
+                sendStartRemind(CourseScheduleEnum.GROUP,sendTeacherMap,courseList);
             }
         });
 
@@ -3111,6 +3113,8 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
                 sendStartRemind(CourseScheduleEnum.PRACTICE,courseList,sendStudentMap);
             }else if(CourseScheduleEnum.VIP.getCode().equals(type)){
                 sendStartRemind(CourseScheduleEnum.VIP,courseList,sendStudentMap);
+            }else if(CourseScheduleEnum.GROUP.getCode().equals(type)){
+                sendStartRemind(CourseScheduleEnum.GROUP,courseList,sendStudentMap);
             }
         });
         this.lambdaUpdate().set(CourseSchedule::getPushStartMsg,true)

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

@@ -81,7 +81,7 @@
     <select id="getByOrderNo" resultMap="BaseResultMap">
         SELECT <include refid="baseColumns" /> FROM user_order_refund t
         WHERE t.order_no_ = #{orderNo} and
-        <foreach collection="orderDetailIds" item="item" open="(" separator="," close=")">
+        <foreach collection="orderDetailIds" item="item" open="(" separator=" or " close=")">
             FIND_IN_SET(#{item}, t.oredr_detil_ids_)
         </foreach>
     </select>