From 6c920885a9bc407f2f05e204ae9769631c4c80e7 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Wed, 22 Dec 2021 15:02:56 +0800 Subject: [PATCH] 20211216 --- src/main/java/cc/mrbird/febs/video/service/impl/AdminVideoMemberServiceImpl.java | 46 ++++++++++++++++++++++++++++------------------ 1 files changed, 28 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..895d83d 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 @@ -7,13 +7,16 @@ import cc.mrbird.febs.video.entity.AppVersion; import cc.mrbird.febs.video.entity.VideoMemberEntity; import cc.mrbird.febs.video.entity.VideoVipInfoEntity; +import cc.mrbird.febs.video.entity.VideoVipOrderInfoEntity; import cc.mrbird.febs.video.enumeration.VipTypeEnum; import cc.mrbird.febs.video.mapper.AppVersionMapper; 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 cc.mrbird.febs.video.vo.AdminVideoVipOrderInfoVo; import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; @@ -41,9 +44,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 +61,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 +110,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(); } @@ -184,5 +187,12 @@ return appVersionMapper.selectById(id); } + @Override + public IPage<AdminVideoVipOrderInfoVo> getOrders(VideoVipOrderInfoEntity videoVipOrderInfoEntity, QueryRequest request) { + Page<VideoMemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize()); + IPage<AdminVideoVipOrderInfoVo> adminVideoVipOrderInfoVos = this.baseMapper.selectAdminVideoVipOrderInfoVoInPage(page, videoVipOrderInfoEntity); + return adminVideoVipOrderInfoVos; + } + } -- Gitblit v1.9.1