fix

wzy

2021-12-17 54e967d4158b1242e94757b56fda70fcb478fc89

 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("视频不存在");