fix 退款服务期

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

@@ -1022,7 +1022,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         List<OrderGoodsVo> list1 = iOrderGoodsService.selectList(orderGoodsQueryBo);
         for(OrderGoodsVo goodsVo : list1){
             if(Validator.isNotEmpty(goodsVo.getServiceEndTime())&&(goodsVo.getServiceEndTime().longValue()>(System.currentTimeMillis()/1000))){
-                throw new CustomException("存在已购买【班级学习服务期未过期】的商品，不可以重复购买商品", 511);
+                if(Validator.isNotEmpty(goodsVo.getGradeId())){
+                    ClassGrade grade = iClassGradeService.getOne(new LambdaQueryWrapper<ClassGrade>()
+                            .eq(ClassGrade::getGradeId, goodsVo.getGradeId()));
+                    //不存在班级有效期才校验服务期是否过期
+                    if(Validator.isEmpty(grade.getClassEndTime())){
+                        throw new CustomException("存在已购买【班级学习服务期未过期】的商品，不可以重复购买商品", 511);
+                    }
+                }
             }
         }
         if (list1 != null && list1.size() > 0) {