merge

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/service/impl/CollectQuestionServiceImpl.java

@@ -67,7 +67,8 @@ public class CollectQuestionServiceImpl extends ServiceImpl<CollectQuestionMappe
                 .eq(CollectQuestion::getGoodsId,goodsId)
                 .last("limit 1"));
         if(Validator.isEmpty(info)){
-            throw new CustomException("没收藏数据");
+            return null;
+//            throw new CustomException("没收藏数据");
         }
         return info;
     }

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

@@ -2330,6 +2330,15 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         if (!order.getUserId().equals(userId)){
             throw new CustomException("订单数据不匹配");
         }
+        ClassGradeUser gradeUserTwo = iClassGradeUserService.getOne(new LambdaQueryWrapper<ClassGradeUser>()
+                .eq(ClassGradeUser::getUserId,userId)
+                .eq(ClassGradeUser::getStatus, 1)
+                .eq(ClassGradeUser::getOrderGoodsId, orderGoodsId)
+                .last("limit 1"));
+        if (ObjectUtils.isNotNull(gradeUserTwo) && gradeUserTwo.getPeriodStatus() == 1 && gradeUserTwo.getFinishStatus() == 1){
+            return true;
+        }
+
         //校验是否有正在学习的七大员继教课程
         List<ClassGradeUser> classGradeUser = iClassGradeUserService.getClassInfoByUser(userId);
         if (CollectionUtils.isEmpty(classGradeUser)){