Merge branch 'feature/1113-vipCourse' into develop-new

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(),courseSchedule.getCourseGroupId().toString(),courseTypeEnum.getCode()},
+                    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

@@ -74,7 +74,7 @@ public class DiscountCardRecordServiceImpl extends ServiceImpl<DiscountCardRecor
         Student student = studentService.getById(orderDetailVo.getUserId());
         LocalDate startTime = LocalDate.now();
         if (student.getDiscountEndTime() != null && student.getDiscountEndTime().after(new Date())) {
-            startTime = student.getDiscountEndTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+            startTime = student.getDiscountEndTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate().plusDays(1);
         }
         LocalDate endTime = LocalDate.now();