This commit is contained in:
dute7liang
2024-01-14 17:15:15 +08:00
parent 986bee0b0f
commit fae8c9b679
11 changed files with 154 additions and 10 deletions

View File

@@ -3,6 +3,8 @@ package com.ruoyi.cai.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.cai.domain.MemberPrice;
import java.util.List;
/**
* 会员价格Service接口
*
@@ -11,4 +13,5 @@ import com.ruoyi.cai.domain.MemberPrice;
*/
public interface MemberPriceService extends IService<MemberPrice> {
List<MemberPrice> listByType(Integer type);
}

View File

@@ -3,6 +3,8 @@ package com.ruoyi.cai.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.cai.domain.MemberSkill;
import java.util.List;
/**
* 会员技能Service接口
*
@@ -11,4 +13,5 @@ import com.ruoyi.cai.domain.MemberSkill;
*/
public interface MemberSkillService extends IService<MemberSkill> {
List<MemberSkill> listByType(Integer type);
}

View File

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.cai.domain.UserMember;
import com.ruoyi.cai.dto.admin.vo.UserMemberAdminVo;
import com.ruoyi.cai.dto.app.vo.user.MemberInfoVo;
import com.ruoyi.common.core.domain.PageQuery;
/**
@@ -18,7 +19,11 @@ public interface UserMemberService extends IService<UserMember> {
UserMember getByUserId(Long userId);
UserMember getByUserIdAndType(Long userId, Integer type);
UserMember getNormalMember(Long userId);
void relieveMember(Long id);
MemberInfoVo memberApp(Long userId, Integer type);
}

View File

@@ -1,11 +1,14 @@
package com.ruoyi.cai.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.cai.domain.MemberPrice;
import com.ruoyi.cai.mapper.MemberPriceMapper;
import com.ruoyi.cai.service.MemberPriceService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 会员价格Service业务层处理
*
@@ -14,4 +17,11 @@ import org.springframework.stereotype.Service;
*/
@Service
public class MemberPriceServiceImpl extends ServiceImpl<MemberPriceMapper,MemberPrice> implements MemberPriceService {
@Override
public List<MemberPrice> listByType(Integer type) {
return this.list(Wrappers.lambdaQuery(MemberPrice.class)
.eq(MemberPrice::getStatus,0)
.eq(MemberPrice::getMemberType,type)
.orderByAsc(MemberPrice::getPrice));
}
}

View File

@@ -1,11 +1,14 @@
package com.ruoyi.cai.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.cai.domain.MemberSkill;
import com.ruoyi.cai.mapper.MemberSkillMapper;
import com.ruoyi.cai.service.MemberSkillService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 会员技能Service业务层处理
*
@@ -14,4 +17,10 @@ import org.springframework.stereotype.Service;
*/
@Service
public class MemberSkillServiceImpl extends ServiceImpl<MemberSkillMapper, MemberSkill> implements MemberSkillService {
@Override
public List<MemberSkill> listByType(Integer type) {
return this.list(Wrappers.lambdaQuery(MemberSkill.class)
.eq(MemberSkill::getStatus,0)
.eq(MemberSkill::getMemberType,type));
}
}

View File

@@ -3,14 +3,27 @@ package com.ruoyi.cai.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.cai.domain.MemberPrice;
import com.ruoyi.cai.domain.MemberSkill;
import com.ruoyi.cai.domain.User;
import com.ruoyi.cai.domain.UserMember;
import com.ruoyi.cai.dto.admin.vo.UserMemberAdminVo;
import com.ruoyi.cai.dto.app.vo.user.MemberInfoVo;
import com.ruoyi.cai.mapper.UserMemberMapper;
import com.ruoyi.cai.pay.MemberStatusEnum;
import com.ruoyi.cai.service.MemberPriceService;
import com.ruoyi.cai.service.MemberSkillService;
import com.ruoyi.cai.service.UserMemberService;
import com.ruoyi.cai.service.UserService;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.exception.ServiceException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
/**
* 会员管理Service业务层处理
*
@@ -20,6 +33,13 @@ import org.springframework.stereotype.Service;
@Service
public class UserMemberServiceImpl extends ServiceImpl<UserMemberMapper, UserMember> implements UserMemberService {
@Autowired
private UserService userService;
@Autowired
private MemberSkillService memberSkillService;
@Autowired
private MemberPriceService memberPriceService;
@Override
public Page<UserMemberAdminVo> pageAdmin(PageQuery pageQuery, UserMemberAdminVo bo) {
return baseMapper.pageAdmin(pageQuery.build(),bo);
@@ -30,6 +50,14 @@ public class UserMemberServiceImpl extends ServiceImpl<UserMemberMapper, UserMem
return this.getOne(Wrappers.lambdaQuery(UserMember.class).eq(UserMember::getUserId,userId).last("limit 1"));
}
@Override
public UserMember getByUserIdAndType(Long userId, Integer type){
return this.getOne(Wrappers.lambdaQuery(UserMember.class)
.eq(UserMember::getUserId,userId)
.eq(UserMember::getMemberType,type)
.last("limit 1"));
}
@Override
public UserMember getNormalMember(Long userId){
return this.getOne(Wrappers.lambdaQuery(UserMember.class).eq(UserMember::getUserId,userId)
@@ -43,4 +71,42 @@ public class UserMemberServiceImpl extends ServiceImpl<UserMemberMapper, UserMem
.eq(UserMember::getId,id)
.set(UserMember::getMemberStatus, MemberStatusEnum.FAIL.getCode()));
}
@Override
public MemberInfoVo memberApp(Long userId, Integer type) {
User user = userService.getById(userId);
if(user == null){
throw new ServiceException("用户不存在");
}
MemberInfoVo memberInfoVo = new MemberInfoVo();
memberInfoVo.setUserId(user.getId());
memberInfoVo.setUsercode(user.getUsercode());
memberInfoVo.setNickname(user.getNickname());
memberInfoVo.setGender(user.getGender());
memberInfoVo.setAvatar(user.getAvatar());
memberInfoVo.setRankHide(user.getRankHide());
memberInfoVo.setNoGreet(user.getNoGreet());
List<MemberPrice> memberPriceList = memberPriceService.listByType(type);
memberInfoVo.setMemberPriceList(memberPriceList);
List<MemberSkill> memberSkillList = memberSkillService.listByType(type);
memberInfoVo.setMemberSkillList(memberSkillList);
UserMember userMember = this.getByUserIdAndType(userId, type);
if(userMember == null || !MemberStatusEnum.NORMAL.getCode().equals(userMember.getMemberStatus())
|| userMember.getExpireDate().isBefore(LocalDateTime.now())){
memberInfoVo.setLongs(0);
if(userMember != null){
memberInfoVo.setExpireTime(userMember.getExpireDate());
memberInfoVo.setExpireTimeStr("已过期");
}else{
memberInfoVo.setExpireTimeStr("未开通");
}
memberInfoVo.setOn(0);
}else {
memberInfoVo.setLongs(0);
memberInfoVo.setExpireTime(userMember.getExpireDate());
memberInfoVo.setExpireTimeStr(userMember.getExpireDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
memberInfoVo.setOn(1);
}
return memberInfoVo;
}
}