Merge branch 'zx_online_update_1218' of http://git.dayaedu.com/yonge/cooleshow into test

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

@@ -566,6 +566,7 @@ 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)) {

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

@@ -3130,7 +3130,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))
@@ -3155,6 +3155,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);
             }
         });
 
@@ -3164,6 +3166,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)