From 54e967d4158b1242e94757b56fda70fcb478fc89 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Fri, 17 Dec 2021 18:50:54 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/video/service/impl/VideoMasterInfoServiceImpl.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/video/service/impl/VideoMasterInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/video/service/impl/VideoMasterInfoServiceImpl.java
index 81ba9de..e225350 100644
--- a/src/main/java/cc/mrbird/febs/video/service/impl/VideoMasterInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/video/service/impl/VideoMasterInfoServiceImpl.java
@@ -179,19 +179,6 @@
videoInfoVo.setCollectCnt(data.getCollectCnt());
videoInfoVo.setStarCnt(data.getStarCnt());
- if (AppContants.FLAG_INT_N.equals(videoInfoEntity.getIsFree())) {
- if (loginUser == null) {
- videoInfoVo.setNotLogin(AppContants.FLAG_INT_N);
- return videoInfoVo;
- }
-
- VideoMemberEntity member = this.videoMemberMapper.selectById(loginUser.getId());
- if (AppContants.FLAG_INT_N.equals(member.getIsVip())) {
- videoInfoVo.setNotVip(AppContants.FLAG_INT_N);
- return videoInfoVo;
- }
- }
-
if (loginUser != null) {
VideoCommentLikeEntity commentLike = this.videoCommentLikeMapper.selectCommentLikeByMemberIdAndRelateId(loginUser.getId(), videoInfoEntity.getId());
if (commentLike != null) {
@@ -208,6 +195,20 @@
}
}
+ if (AppContants.FLAG_INT_N.equals(videoInfoEntity.getIsFree())) {
+ if (loginUser == null) {
+ videoInfoVo.setNotLogin(AppContants.FLAG_INT_N);
+ return videoInfoVo;
+ }
+
+ VideoMemberEntity member = this.videoMemberMapper.selectById(loginUser.getId());
+ if (AppContants.FLAG_INT_N.equals(member.getIsVip())) {
+ videoInfoVo.setNotVip(AppContants.FLAG_INT_N);
+ return videoInfoVo;
+ }
+ }
+
+
VideoMasterItemsEntity currentItem = this.videoMasterItemsMapper.selectItemByVideoIdAndItemId(videoId, itemId);
if (currentItem == null) {
throw new FebsException("视频不存在");
--
Gitblit v1.9.1