20211216

xiaoyong931011

2021-12-17 584e056e2d51ddd5757c78efcfcc2c6931928e2f

20211216

 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);
    }


 src/main/java/cc/mrbird/febs/video/vo/ApiVideoMemberVo.java

@@ -1,8 +1,11 @@
package cc.mrbird.febs.video.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

@Data
@ApiModel(value = "ApiVideoMemberVo", description = "返回参数类")
@@ -102,4 +105,11 @@
     * 测试账号
     */
    public static final Integer ACCOUNT_TYPE_TEST = 2;

    @ApiModelProperty(value = "会员类型;MONTH/PERIOD/YEAR")
    private String vipType;

    @ApiModelProperty(value = "到期时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date expireTime;
}