From f7410364109ebb426a5e0184683a10fb1efdd0a0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 22 Dec 2021 14:59:27 +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 | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 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 d254365..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
@@ -13,6 +13,7 @@
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;
@@ -41,9 +42,9 @@
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;
}
@@ -58,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
@@ -107,21 +108,21 @@
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);
+// 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();
}
--
Gitblit v1.9.1