20211216

xiaoyong931011

2021-12-20 ab7ad951ca58764c8370d0adfab96600227def39

20211216

 src/main/java/cc/mrbird/febs/video/dto/AdminSetVipDto.java

@@ -2,13 +2,14 @@

import io.swagger.annotations.ApiModel;
import lombok.Data;
import javax.validation.constraints.NotBlank;

@Data
@ApiModel(value = "ApiMyVideoCollectionDto", description = "接收参数类")
public class AdminSetVipDto {

    @NotBlank(message = "入参不能为空")
    private Long id;

    @NotBlank(message = "入参不能为空")
    private String vipType;

}

 src/main/java/cc/mrbird/febs/video/mapper/VideoVipInfoMapper.java

@@ -8,7 +8,7 @@

public interface VideoVipInfoMapper extends BaseMapper<VideoVipInfoEntity> {

    List<VideoVipInfoEntity> selectVideoVipInfoByMemberIdAndState(@Param("memberId") long memberId, @Param("state")Integer state);
    VideoVipInfoEntity selectVideoVipInfoByMemberIdAndState(@Param("memberId") long memberId, @Param("state")Integer state);

    VideoVipInfoEntity selectByMemberId(@Param("memberId") Long memberId);
}

 src/main/java/cc/mrbird/febs/video/service/impl/AdminVideoMemberServiceImpl.java

@@ -12,6 +12,7 @@
import cc.mrbird.febs.video.mapper.VideoMemberMapper;
import cc.mrbird.febs.video.mapper.VideoVipInfoMapper;
import cc.mrbird.febs.video.service.IAdminVideoMemberService;
import cc.mrbird.febs.video.service.IApiVideoMemberService;
import cc.mrbird.febs.video.vo.AdminVideoMemberVo;
import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateUtil;
@@ -26,6 +27,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;

@@ -36,6 +38,7 @@

    private final VideoVipInfoMapper videoVipInfoMapper;
    private final AppVersionMapper appVersionMapper;
    private final IApiVideoMemberService apiVideoMemberService;

    @Override
    public IPage<VideoMemberEntity> getVideoMembers(VideoMemberEntity videoMember, QueryRequest request) {
@@ -97,10 +100,12 @@
        videoMemberEntity.setIsVip(VideoMemberEntity.ISVIP_STATUS_YES);
        this.baseMapper.updateById(videoMemberEntity);

        List<VideoVipInfoEntity> videoVipInfoEntities = videoVipInfoMapper.selectVideoVipInfoByMemberIdAndState(adminSetVipDto.getId(),1);
        if(CollUtil.isNotEmpty(videoVipInfoEntities)){
        VideoVipInfoEntity videoVipInfoEntities = videoVipInfoMapper.selectVideoVipInfoByMemberIdAndState(adminSetVipDto.getId(),1);
        if(ObjectUtil.isNotEmpty(videoVipInfoEntities)){
            return new FebsResponse().fail().message("用户的会员还未失效");
        }

        apiVideoMemberService.extendVipTime(adminSetVipDto.getVipType(), videoMemberEntity.getId());

        VideoVipInfoEntity videoVipInfoEntity = new VideoVipInfoEntity();
        videoVipInfoEntity.setMemberId(adminSetVipDto.getId());
@@ -132,12 +137,9 @@
        }
        videoMemberEntity.setIsVip(VideoMemberEntity.ISVIP_STATUS_NO);
        this.baseMapper.updateById(videoMemberEntity);
        List<VideoVipInfoEntity> videoVipInfoEntities = videoVipInfoMapper.selectVideoVipInfoByMemberIdAndState(videoMemberEntity.getId(),1);
        if(CollUtil.isNotEmpty(videoVipInfoEntities)){
            for(VideoVipInfoEntity videoVipInfoEntity : videoVipInfoEntities){
                videoVipInfoEntity.setState(2);
                videoVipInfoMapper.updateById(videoVipInfoEntity);
            }
        VideoVipInfoEntity videoVipInfoEntities = videoVipInfoMapper.selectVideoVipInfoByMemberIdAndState(videoMemberEntity.getId(),1);
        if(ObjectUtil.isNotEmpty(videoVipInfoEntities)){
                videoVipInfoMapper.deleteById(videoVipInfoEntities.getId());
        }
        return new FebsResponse().success();
    }

 src/main/java/cc/mrbird/febs/video/service/impl/VideoMasterInfoServiceImpl.java

@@ -263,10 +263,11 @@
            videoCollectionMapper.deleteById(videoCollection.getId());

            //收藏数-1
            VideoMasterDataEntity videoMasterDataEntity = videoMasterDataMapper.selectDataByMasterId(videoId);
            int collectCnt = videoMasterDataEntity.getCollectCnt();
            videoMasterDataEntity.setCollectCnt((collectCnt - 1) <= 0 ? 0:(collectCnt - 1));
            videoMasterDataMapper.updateById(videoMasterDataEntity);
            this.videoMasterDataService.modifyVideoData(videoMasterInfoEntity.getId(), -1, 2);
//            VideoMasterDataEntity videoMasterDataEntity = videoMasterDataMapper.selectDataByMasterId(videoId);
//            int collectCnt = videoMasterDataEntity.getCollectCnt();
//            videoMasterDataEntity.setCollectCnt((collectCnt - 1) <= 0 ? 0:(collectCnt - 1));
//            videoMasterDataMapper.updateById(videoMasterDataEntity);
            return new FebsResponse().success().message("已取消收藏");
        }else{
            VideoCollectionEntity videoCollectionEntity = new VideoCollectionEntity();
@@ -274,10 +275,12 @@
            videoCollectionEntity.setVideoId(videoId);
            videoCollectionMapper.insert(videoCollectionEntity);
            //收藏数+1
            VideoMasterDataEntity videoMasterDataEntity = videoMasterDataMapper.selectDataByMasterId(videoId);
            int collectCnt = videoMasterDataEntity.getCollectCnt();
            videoMasterDataEntity.setCollectCnt((collectCnt + 1) <= 0 ? 0:(collectCnt + 1));
            videoMasterDataMapper.updateById(videoMasterDataEntity);

            this.videoMasterDataService.modifyVideoData(videoMasterInfoEntity.getId(), 1, 2);
//            VideoMasterDataEntity videoMasterDataEntity = videoMasterDataMapper.selectDataByMasterId(videoId);
//            int collectCnt = videoMasterDataEntity.getCollectCnt();
//            videoMasterDataEntity.setCollectCnt((collectCnt + 1) <= 0 ? 0:(collectCnt + 1));
//            videoMasterDataMapper.updateById(videoMasterDataEntity);
            return new FebsResponse().success().message("已收藏");
        }
    }
@@ -288,19 +291,21 @@
        Integer type = apiVideoLikeDto.getType();
        Long relateId = apiVideoLikeDto.getRelateId();
        VideoCommentLikeEntity videoCommentLikeEntity = videoCommentLikeMapper.selectCommentLikeByMemberIdAndRelateId(id,relateId);

        VideoMasterInfoEntity videoMasterInfoEntity = this.baseMapper.selectById(relateId);
        if(videoCommentLikeEntity != null){
            if(1 == type){
                //视频
                VideoMasterInfoEntity videoMasterInfoEntity = this.baseMapper.selectById(relateId);
                if(videoMasterInfoEntity == null){
                    throw new FebsException("视频不存在");
                }
                videoCommentLikeMapper.deleteById(videoCommentLikeEntity.getId());
                //点赞数-1
                VideoMasterDataEntity videoMasterDataEntity = videoMasterDataMapper.selectDataByMasterId(relateId);
                int starCnt = videoMasterDataEntity.getStarCnt();
                videoMasterDataEntity.setStarCnt((starCnt - 1) <= 0 ? 0:(starCnt - 1));
                videoMasterDataMapper.updateById(videoMasterDataEntity);
                this.videoMasterDataService.modifyVideoData(videoMasterInfoEntity.getId(), -1, 3);
//                VideoMasterDataEntity videoMasterDataEntity = videoMasterDataMapper.selectDataByMasterId(relateId);
//                int starCnt = videoMasterDataEntity.getStarCnt();
//                videoMasterDataEntity.setStarCnt((starCnt - 1) <= 0 ? 0:(starCnt - 1));
//                videoMasterDataMapper.updateById(videoMasterDataEntity);
                return new FebsResponse().success().message("已取消点赞");
            }else if(2 == type){
                //评论
@@ -320,6 +325,8 @@
            videoCommentLike.setMemberId(id);
            videoCommentLikeMapper.insert(videoCommentLike);
            //点赞数+1

            this.videoMasterDataService.modifyVideoData(videoMasterInfoEntity.getId(), 1, 3);
            VideoMasterDataEntity videoMasterDataEntity = videoMasterDataMapper.selectDataByMasterId(relateId);
            int starCnt = videoMasterDataEntity.getStarCnt();
            videoMasterDataEntity.setStarCnt((starCnt + 1) <= 0 ? 0:(starCnt + 1));