From ab7ad951ca58764c8370d0adfab96600227def39 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 20 Dec 2021 11:55:22 +0800
Subject: [PATCH] 20211216
---
src/main/java/cc/mrbird/febs/video/service/impl/AdminVideoMemberServiceImpl.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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..d254365 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,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();
}
--
Gitblit v1.9.1