Merge branch 'master' of http://120.27.238.55:7000/r/xc-video

Helius

2021-12-20 bda2b9375e9e7fbefe22fbc56b2ea85e9b12f9d7

 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("视频不存在");
@@ -220,6 +221,21 @@
        videoInfoVo.setThumb(currentItem.getThumb());
        videoInfoVo.setItemId(currentItem.getId());
        videoInfoVo.setTimeLength(currentItem.getTimeLength());

        if (loginUser != null) {
            VideoHistoryEntity history = this.videoHistoryMapper.selectByMemberIdAndVideoId(loginUser.getId(), videoInfoEntity.getId());
            if (history == null) {
                history = new VideoHistoryEntity();
                history.setVideoId(videoInfoEntity.getId());
                history.setMemberId(loginUser.getId());
                history.setVideoItemId(currentItem.getId());
                this.videoHistoryMapper.insert(history);
            } else {
                history.setVideoItemId(currentItem.getId());
                this.videoHistoryMapper.updateById(history);
            }
        }

        return videoInfoVo;
    }