From bdf9983a1e03986e5304d1b87f1c6f80a5d908ed Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 17 Dec 2021 11:46:18 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-video
---
src/main/java/cc/mrbird/febs/video/service/impl/ApiVideoMemberServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 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 8379729..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
@@ -7,15 +7,12 @@
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.common.utils.ShareCodeUtil;
import cc.mrbird.febs.video.conversion.VideoMemberConversion;
-import cc.mrbird.febs.video.dto.ApiMyVideoCollectionDto;
-import cc.mrbird.febs.video.dto.ApiMyVideoHistoryDto;
-import cc.mrbird.febs.video.dto.LoginDto;
-import cc.mrbird.febs.video.dto.RegisterDto;
+import cc.mrbird.febs.video.dto.*;
+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.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;
@@ -24,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 +45,8 @@
private final RedisUtils redisUtils;
private final VideoCollectionMapper videoCollectionMapper;
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+ private final AppVersionMapper appVersionMapper;
+ private final VideoVipInfoMapper videoVipInfoMapper;
@Override
public FebsResponse register(RegisterDto registerDto) {
@@ -55,6 +55,13 @@
throw new FebsException("该账号已被占用");
}
videoMember = new VideoMemberEntity();
+ if(StrUtil.isNotEmpty(registerDto.getInviteId())){
+ VideoMemberEntity videoMemberEntity = this.baseMapper.selectInfoByInviteId(registerDto.getInviteId());
+ if (ObjectUtil.isEmpty(videoMemberEntity)) {
+ throw new FebsException("邀请码不存在");
+ }
+ videoMember.setRefererId(registerDto.getInviteId());
+ }
videoMember.setPassword(SecureUtil.md5(registerDto.getPassword()));
videoMember.setAccount(registerDto.getAccount());
videoMember.setName(registerDto.getAccount());
@@ -139,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);
}
@@ -166,6 +179,26 @@
return new FebsResponse().success().data(dataDictionaryCustoms);
}
+ @Override
+ public List<AppVersion> findAppVersion() {
+ return appVersionMapper.selectList(null);
+ }
+
+ @Override
+ public FebsResponse updateName(ApiUpdateNameDto apiUpdateNameDto) {
+ Long id = LoginUserUtil.getLoginUser().getId();
+ VideoMemberEntity videoMemberEntity = this.baseMapper.selectById(id);
+ if(StrUtil.isNotEmpty(apiUpdateNameDto.getName())){
+ videoMemberEntity.setName(apiUpdateNameDto.getName());
+ }
+
+ if(StrUtil.isNotEmpty(apiUpdateNameDto.getAvatar())){
+ videoMemberEntity.setAvatar(apiUpdateNameDto.getAvatar());
+ }
+ this.baseMapper.updateById(videoMemberEntity);
+ return new FebsResponse().success().message("成功");
+ }
+
public String generateAsaToken(String token) {
RSA rsa = new RSA(null, AppContants.PUBLIC_KEY);
--
Gitblit v1.9.1