Merge branch 'online' into test

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

@@ -397,6 +397,7 @@ public class DiscountCardRecordServiceImpl extends ServiceImpl<DiscountCardRecor
                 .eq(DiscountCardRecord::getEfficientFlag, true)
                 .eq(DiscountCardRecord::getMsgStatus, 0)
                 .lt(DiscountCardRecord::getEndTime, DateUtil.localDateTimeToDate(LocalDateTime.now().plusDays(4)))
+                .gt(DiscountCardRecord::getEndTime, DateUtil.localDateTimeToDate(LocalDateTime.now().plusDays(3)))
                 .list();
         if(CollectionUtils.isNotEmpty(records)){
             //获取用户编号
@@ -413,6 +414,7 @@ public class DiscountCardRecordServiceImpl extends ServiceImpl<DiscountCardRecor
                 .eq(DiscountCardRecord::getEfficientFlag, true)
                 .in(DiscountCardRecord::getMsgStatus, 0,1)
                 .lt(DiscountCardRecord::getEndTime, DateUtil.localDateTimeToDate(LocalDateTime.now().plusDays(1)))
+                .gt(DiscountCardRecord::getEndTime, DateUtil.localDateTimeToDate(LocalDateTime.now()))
                 .list();
         if (CollectionUtils.isNotEmpty(expireRecords)) {
             //获取用户编号

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

@@ -1418,6 +1418,7 @@ DISCOUNT("畅学卡")
                 }
                 break;
             }
+            case VIP_COURSE:
             case PRACTICE: {
                 Teacher teacher = teacherService.getById(payTypeReq.getBizId());
                 if (Objects.isNull(teacher)) {

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

@@ -96,7 +96,7 @@
         left join course_schedule_student_payment a on t.user_id_ = a.user_id_
         left join course_schedule b on a.course_id_ = b.id_
         LEFT JOIN course_group cg ON cg.id_ = b.course_group_id_
-        where b.lock_ = 0 AND cg.status_ IN ('COMPLETE','ING')
+        where b.lock_ = 0 AND cg.status_ IN ('COMPLETE','ING','APPLY')
             <if test="userId != null and userId != ''">
                 and t.user_id_ = #{userId}
             </if>