From f0afca8e5611e46557f69cd22850c630388d329f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 22 Dec 2021 14:46:31 +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/AdminVideoMemberServiceImpl.java | 55 +++++++++++++++++++++++++++++--------------------------
1 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/video/service/impl/AdminVideoMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/video/service/impl/AdminVideoMemberServiceImpl.java
index 5a58e1e..31af450 100644
--- a/src/main/java/cc/mrbird/febs/video/service/impl/AdminVideoMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/video/service/impl/AdminVideoMemberServiceImpl.java
@@ -12,6 +12,8 @@
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.AdminVideoMemberEntityVo;
import cc.mrbird.febs.video.vo.AdminVideoMemberVo;
import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateUtil;
@@ -26,6 +28,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,11 +39,12 @@
private final VideoVipInfoMapper videoVipInfoMapper;
private final AppVersionMapper appVersionMapper;
+ private final IApiVideoMemberService apiVideoMemberService;
@Override
- public IPage<VideoMemberEntity> getVideoMembers(VideoMemberEntity videoMember, QueryRequest request) {
+ public IPage<AdminVideoMemberEntityVo> getVideoMembers(VideoMemberEntity videoMember, QueryRequest request) {
Page<VideoMemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
- IPage<VideoMemberEntity> videoMembers = this.baseMapper.selectVideoMemberListInPage(page, videoMember);
+ IPage<AdminVideoMemberEntityVo> videoMembers = this.baseMapper.selectVideoMemberListInPage(page, videoMember);
return videoMembers;
}
@@ -55,7 +59,7 @@
String pwd = SecureUtil.md5("a123456");
videoMemberEntity.setPassword(pwd);
this.baseMapper.updateById(videoMemberEntity);
- return new FebsResponse().success().message("重置成功");
+ return new FebsResponse().success().message("重置成功,重置后的密码为：a123456");
}
@Override
@@ -97,26 +101,28 @@
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("用户的会员还未失效");
}
- VideoVipInfoEntity videoVipInfoEntity = new VideoVipInfoEntity();
- videoVipInfoEntity.setMemberId(adminSetVipDto.getId());
- videoVipInfoEntity.setVipType(adminSetVipDto.getVipType());
- videoVipInfoEntity.setBuyTime(new Date());
- videoVipInfoEntity.setState(1);
- if(VipTypeEnum.MONTH.name().equals(adminSetVipDto.getVipType())){
- videoVipInfoEntity.setExpireTime(DateUtil.offset(new Date(), DateField.MONTH,1));
- }
- if(VipTypeEnum.PERIOD.name().equals(adminSetVipDto.getVipType())){
- videoVipInfoEntity.setExpireTime(DateUtil.offset(new Date(), DateField.MONTH,3));
- }
- if(VipTypeEnum.YEAR.name().equals(adminSetVipDto.getVipType())){
- videoVipInfoEntity.setExpireTime(DateUtil.offset(new Date(), DateField.MONTH,12));
- }
- videoVipInfoMapper.insert(videoVipInfoEntity);
+ apiVideoMemberService.extendVipTime(adminSetVipDto.getVipType(), videoMemberEntity.getId());
+
+// VideoVipInfoEntity videoVipInfoEntity = new VideoVipInfoEntity();
+// videoVipInfoEntity.setMemberId(adminSetVipDto.getId());
+// videoVipInfoEntity.setVipType(adminSetVipDto.getVipType());
+// videoVipInfoEntity.setBuyTime(new Date());
+// videoVipInfoEntity.setState(1);
+// if(VipTypeEnum.MONTH.name().equals(adminSetVipDto.getVipType())){
+// videoVipInfoEntity.setExpireTime(DateUtil.offset(new Date(), DateField.MONTH,1));
+// }
+// if(VipTypeEnum.PERIOD.name().equals(adminSetVipDto.getVipType())){
+// videoVipInfoEntity.setExpireTime(DateUtil.offset(new Date(), DateField.MONTH,3));
+// }
+// if(VipTypeEnum.YEAR.name().equals(adminSetVipDto.getVipType())){
+// videoVipInfoEntity.setExpireTime(DateUtil.offset(new Date(), DateField.MONTH,12));
+// }
+// videoVipInfoMapper.insert(videoVipInfoEntity);
return new FebsResponse().success();
}
@@ -132,12 +138,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();
}
--
Gitblit v1.9.1