From 584e056e2d51ddd5757c78efcfcc2c6931928e2f Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Fri, 17 Dec 2021 10:46:57 +0800 Subject: [PATCH] 20211216 --- src/main/java/cc/mrbird/febs/video/service/impl/ApiVideoMemberServiceImpl.java | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/video/service/impl/ApiVideoMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/video/service/impl/ApiVideoMemberServiceImpl.java index 06e8684..27420d7 100644 --- a/src/main/java/cc/mrbird/febs/video/service/impl/ApiVideoMemberServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/video/service/impl/ApiVideoMemberServiceImpl.java @@ -11,10 +11,8 @@ import cc.mrbird.febs.video.entity.AppVersion; import cc.mrbird.febs.video.entity.DataDictionaryCustom; import cc.mrbird.febs.video.entity.VideoMemberEntity; -import cc.mrbird.febs.video.mapper.AppVersionMapper; -import cc.mrbird.febs.video.mapper.DataDictionaryCustomMapper; -import cc.mrbird.febs.video.mapper.VideoCollectionMapper; -import cc.mrbird.febs.video.mapper.VideoMemberMapper; +import cc.mrbird.febs.video.entity.VideoVipInfoEntity; +import cc.mrbird.febs.video.mapper.*; import cc.mrbird.febs.video.service.IApiVideoMemberService; import cc.mrbird.febs.video.vo.ApiMyVideoCollectionVo; import cc.mrbird.febs.video.vo.ApiMyVideoHistoryVo; @@ -23,6 +21,7 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.asymmetric.KeyType; import cn.hutool.crypto.asymmetric.RSA; @@ -47,6 +46,7 @@ private final VideoCollectionMapper videoCollectionMapper; private final DataDictionaryCustomMapper dataDictionaryCustomMapper; private final AppVersionMapper appVersionMapper; + private final VideoVipInfoMapper videoVipInfoMapper; @Override public FebsResponse register(RegisterDto registerDto) { @@ -146,6 +146,12 @@ Long id = LoginUserUtil.getLoginUser().getId(); VideoMemberEntity videoMemberEntity = this.baseMapper.selectById(id); ApiVideoMemberVo apiVideoMemberVo = VideoMemberConversion.INSTANCE.entityToVo(videoMemberEntity); + List<VideoVipInfoEntity> videoVipInfoEntities = videoVipInfoMapper.selectVideoVipInfoByMemberIdAndState(id, 1); + if(CollUtil.isNotEmpty(videoVipInfoEntities)){ + VideoVipInfoEntity videoVipInfoEntity = videoVipInfoEntities.get(0); + apiVideoMemberVo.setExpireTime(videoVipInfoEntity.getExpireTime()); + apiVideoMemberVo.setVipType(videoVipInfoEntity.getVipType()); + } return new FebsResponse().success().data(apiVideoMemberVo); } -- Gitblit v1.9.1