Merge branch 'pre' into dev

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamApplyServiceImpl.java

@@ -198,7 +198,7 @@ public class ExamApplyServiceImpl extends ServiceImpl<ExamApplyMapper, ExamApply
         //查询学时通过情况
         Integer countGradePeriod = baseMapper.countGradePeriod(bo);
         if (countGradePeriod < 1){
-            throw new CustomException("学时审核未通过或者班级有效期已过，不可以报名参加考试");
+            throw new CustomException("学时审核未通过，不可以报名参加考试");
         }
         //查询考试通过情况
         Integer countSubscribe = baseMapper.countSubscribe(bo);

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

@@ -258,7 +258,7 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
                 UserExamGoodsQueryBo examGoodsQueryBo = new UserExamGoodsQueryBo();
                 examGoodsQueryBo.setOrderGoodsId(orderGoods.getOrderGoodsId());
                 if(!iUserExamGoodsService.canRefund(examGoodsQueryBo)){
-                    throw new CustomException("剩余次数不够，无法退款");
+                    throw new CustomException("补考次数/前培次数已经被使用，不符号退款条件");
                 }
             }
             OrderGoodsRefund add = BeanUtil.toBean(bo, OrderGoodsRefund.class);

zhongzheng-system/src/main/resources/mapper/modules/exam/ExamApplyMapper.xml

@@ -221,7 +221,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND cgu.user_id = #{userId}
           and cgu.grade_id = #{gradeId}
           AND cgu.period_status = 1
-           and (unix_timestamp(now()) < cg.class_end_time or cg.class_start_time is null)
           and cg.`status` =1
           and cgu.`status` =1
     </select>