fix 班级有效期

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodStudentVo.java

@@ -131,8 +131,8 @@ public class ClassPeriodStudentVo {
 	private Long studyEndTime;
 
 	/** 学员编码 */
-	@Excel(name = "當前班級學員審核狀態 -1不可审核 0待審  1未通过 2通过")
-	@ApiModelProperty("當前班級學員審核狀態 -1不可审核 0待審  1未通过 2通过")
+	@Excel(name = "當前班級學員審核狀態 -1不可审核 0待審  1未通过 2通过 3审核中")
+	@ApiModelProperty("當前班級學員審核狀態 -1不可审核 0待審  1未通过 2通过 3审核中")
 	private Integer allStatus;
 
 	/** 待重修 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsServiceImpl.java

@@ -549,6 +549,8 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
                 goodsVo.setPeriodPlush(classGradeVo.getPeriodPlush());
                 goodsVo.setGradeStatus(classGradeVo.getStatus());
                 goodsVo.setOfficialName(classGradeVo.getOfficialName());
+                goodsVo.setClassStartTime(classGradeVo.getClassStartTime());
+                goodsVo.setClassEndTime(classGradeVo.getClassEndTime());
 
                 LambdaQueryWrapper<UserSubscribe> lq = Wrappers.lambdaQuery();
                 lq.eq(UserSubscribe::getOrderGoodsId, goodsVo.getOrderGoodsId());

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -1621,6 +1621,9 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
         List<UserMockSubscribe> userMockSubscribeList = iUserMockSubscribeService.list(lqw);
         userMockSubscribeList.removeIf(userMockSubscribe -> {
             try {
+                if(Validator.isEmpty(userMockSubscribe.getApplySiteExamTime())||Validator.isEmpty(userMockSubscribe.getApplySiteStartTime())){
+                    return true;
+                }
                 return System.currentTimeMillis()/1000 + 3600 <= formatTime(userMockSubscribe.getApplySiteExamTime(), userMockSubscribe.getApplySiteStartTime());
             } catch (ParseException e) {
                 e.printStackTrace();