Merge branch 'feature/1113-vipCourse' into test

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

@@ -163,7 +163,7 @@ public class CourseRepliedServiceImpl extends ServiceImpl<CourseScheduleRepliedD
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,
                     messageType,
                     teacherReceivers,
-                    new String[]{courseSchedule.getId().toString(),studentId.toString()},
+                    new String[]{courseSchedule.getId().toString(),courseSchedule.getCourseGroupId().toString(),courseSchedule.getType()},
                     null,
                     0,
                     ClientEnum.TEACHER.getCode(),

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

@@ -97,6 +97,9 @@ public class DiscountCardRecordServiceImpl extends ServiceImpl<DiscountCardRecor
             default:
                 log.error("时间类型错误{}", discountCardRecord.getType());
         }
+        if (startTime.isAfter(LocalDate.now())) {
+            startTime = startTime.plusDays(1);
+        }
         discountCardRecord.setStartTime(DateUtil.localDateTimeToDate(startTime.atTime(LocalTime.MIN)));
         discountCardRecord.setEndTime(DateUtil.localDateTimeToDate(endTime.atTime(23,59,59)));
 

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

@@ -1094,7 +1094,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
         //统计学员本周练习时长
         summaryDto.setRecordTime(sysMusicCompareRecordService.getDao().countStudentPracticeTime(userId, monday, sunday));
         //统计本周以上课程数
-        summaryDto.setCourseCount(courseScheduleService.getDao().countStudentOverCourse(userId, monday, sunday,"ING,COMPLETE"));
+        summaryDto.setCourseCount(courseScheduleService.getDao().countStudentOverCourse(userId, monday, sunday,"COMPLETE"));
         //统计本周总课程数
         summaryDto.setTotalCourseCount(courseScheduleService.getDao().countStudentOverCourse(userId, monday, sunday,null));
         return summaryDto;

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

@@ -90,7 +90,7 @@
             </if>
             <if test="param.search != null and param.search !=''">
                 and  (
-                u.real_name_ like concat('%',#{param.search},'%')
+                u.username_ like concat('%',#{param.search},'%')
                 or b.name_ like concat('%',#{param.search},'%')
                 )
             </if>