shayu/xq-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init

Browse Source
This commit is contained in:
77
2024-04-20 23:00:16 +08:00
parent 10486e593a
commit bd9eb02713
18 changed files with 327 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserAuthService.java
View File

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.xq.domain.UserAuth;
import com.ruoyi.xq.dto.admin.user.UserAuthAdminVo;
import com.ruoyi.xq.dto.admin.userauth.UserAuthAdminInfoVo;
/**
* 用户认证管理Service接口
@@ -16,4 +17,10 @@ public interface UserAuthService extends IService<UserAuth> {
UserAuth getByUserId(Long userId);
Page<UserAuthAdminVo> pageAdmin(PageQuery pageQuery, UserAuthAdminVo bo);
UserAuthAdminInfoVo getAdminById(Long id);
void updateUserAuth(UserAuth bo);
void checkAuthNum(Long userId);
}

5
ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserInfoService.java
View File

@@ -6,6 +6,7 @@ import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.xq.domain.UserInfo;
import com.ruoyi.xq.dto.admin.user.UserInfoDetailAdminVo;
import com.ruoyi.xq.dto.admin.user.UserInfoListAdminVo;
import com.ruoyi.xq.dto.admin.user.req.UpdateUserInfoReq;
/**
* 用户信息Service接口
@@ -20,5 +21,7 @@ public interface UserInfoService extends IService<UserInfo> {
Page<UserInfoListAdminVo> pageAdmin(PageQuery pageQuery, UserInfoListAdminVo bo);
UserInfoDetailAdminVo fullUserInfo(Long id);
UpdateUserInfoReq getUserInfoUpdate(Long userId);
void updateInfo(UpdateUserInfoReq bo);
}

1
ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserService.java
View File

@@ -57,6 +57,5 @@ public interface UserService extends IService<User> {
void saveUser(AddUserReq bo);
@Transactional(rollbackFor = Exception.class)
void updateBaseUser(UpdateUserReq updateUserReq);
}

10
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserAuthAuditServiceImpl.java
View File

@@ -65,34 +65,40 @@ public class UserAuthAuditServiceImpl extends ServiceImpl<UserAuthAuditMapper,Us
UserAuthAudit userInfoAudit = this.getById(id);
if(userInfoAudit.getAuthType().equals(UserAuthTypeEnum.CAR.getCode())){
userAuthService.update(Wrappers.lambdaUpdate(UserAuth.class)
.eq(UserAuth:: getUserId, userInfoAudit.getUserId())
.set(UserAuth:: getCarAuth, AuditEnum.SUCCESS.getCode())
.eq(UserAuth::getUserId, userInfoAudit.getUserId())
.set(UserAuth::getCarAuth, AuditEnum.SUCCESS.getCode())
.set(UserAuth::getCarPic, userInfoAudit.getAuthPic()));
userAuthService.checkAuthNum(userInfoAudit.getUserId());
}else if(userInfoAudit.getAuthType().equals(UserAuthTypeEnum.JOB.getCode())){
userAuthService.update(Wrappers.lambdaUpdate(UserAuth.class)
.eq(UserAuth:: getUserId, userInfoAudit.getUserId())
.set(UserAuth:: getJobAuth, AuditEnum.SUCCESS.getCode())
.set(UserAuth:: getJobPic, userInfoAudit.getAuthPic())
.set(UserAuth:: getJobAuthType, userInfoAudit.getAuthOther()));
userAuthService.checkAuthNum(userInfoAudit.getUserId());
}else if(userInfoAudit.getAuthType().equals(UserAuthTypeEnum.EDUCATION.getCode())){
userAuthService.update(Wrappers.lambdaUpdate(UserAuth.class)
.eq(UserAuth:: getUserId, userInfoAudit.getUserId())
.set(UserAuth:: getEducationAuth, AuditEnum.SUCCESS.getCode())
.set(UserAuth:: getEducationPic, userInfoAudit.getAuthPic()));
userAuthService.checkAuthNum(userInfoAudit.getUserId());
}else if(userInfoAudit.getAuthType().equals(UserAuthTypeEnum.HOUSE.getCode())){
userAuthService.update(Wrappers.lambdaUpdate(UserAuth.class)
.eq(UserAuth:: getUserId, userInfoAudit.getUserId())
.set(UserAuth:: getHouseAuth, AuditEnum.SUCCESS.getCode())
.set(UserAuth:: getHousePic, userInfoAudit.getAuthPic()));
userAuthService.checkAuthNum(userInfoAudit.getUserId());
}else if(userInfoAudit.getAuthType().equals(UserAuthTypeEnum.MARRIAGE.getCode())){
userAuthService.update(Wrappers.lambdaUpdate(UserAuth.class)
.eq(UserAuth:: getUserId, userInfoAudit.getUserId())
.set(UserAuth:: getMarriageAuth, AuditEnum.SUCCESS.getCode())
.set(UserAuth:: getMarriagePic, userInfoAudit.getAuthPic()));
userAuthService.checkAuthNum(userInfoAudit.getUserId());
}else if(userInfoAudit.getAuthType().equals(UserAuthTypeEnum.SINGLE.getCode())){
userAuthService.update(Wrappers.lambdaUpdate(UserAuth.class)
.eq(UserAuth:: getUserId, userInfoAudit.getUserId())
.set(UserAuth:: getSinglePersonAuth, AuditEnum.SUCCESS.getCode()));
userAuthService.checkAuthNum(userInfoAudit.getUserId());
}
}
}

70
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserAuthServiceImpl.java
View File

@@ -4,11 +4,18 @@ 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.common.core.domain.PageQuery;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.xq.domain.User;
import com.ruoyi.xq.domain.UserAuth;
import com.ruoyi.xq.dto.admin.user.UserAuthAdminVo;
import com.ruoyi.xq.dto.admin.userauth.UserAuthAdminInfoVo;
import com.ruoyi.xq.enums.common.AuditEnum;
import com.ruoyi.xq.mapper.UserAuthMapper;
import com.ruoyi.xq.service.UserAuthService;
import com.ruoyi.xq.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
* 用户认证管理Service业务层处理
@@ -19,6 +26,9 @@ import org.springframework.stereotype.Service;
@Service
public class UserAuthServiceImpl extends ServiceImpl<UserAuthMapper,UserAuth> implements UserAuthService {
@Autowired
private UserService userService;
@Override
public UserAuth getByUserId(Long userId) {
return this.getOne(Wrappers.lambdaQuery(UserAuth.class)
@@ -29,4 +39,64 @@ public class UserAuthServiceImpl extends ServiceImpl<UserAuthMapper,UserAuth> im
public Page<UserAuthAdminVo> pageAdmin(PageQuery pageQuery, UserAuthAdminVo bo) {
return baseMapper.pageAdmin(pageQuery.build(), bo);
}
@Override
public UserAuthAdminInfoVo getAdminById(Long id) {
UserAuthAdminInfoVo vo = new UserAuthAdminInfoVo();
UserAuth userAuth = this.getById(id);
User user = userService.getById(userAuth.getUserId());
vo.setUser(user);
vo.setUserAuth(userAuth);
return vo;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updateUserAuth(UserAuth bo) {
UserAuth update = new UserAuth();
update.setId(bo.getId());
// update.setAlreadyAuthNum();
update.setCardNumAuth(bo.getCardNumAuth());
update.setSinglePersonAuth(bo.getSinglePersonAuth());
update.setEducationAuth(bo.getEducationAuth());
update.setJobAuth(bo.getJobAuth());
update.setCarAuth(bo.getCarAuth());
update.setHouseAuth(bo.getHouseAuth());
update.setMarriageAuth(bo.getMarriageAuth());
this.updateById(update);
UserAuthService userAuthService = SpringUtils.getBean(UserAuthService.class);
userAuthService.checkAuthNum(bo.getUserId());
}
@Override
public void checkAuthNum(Long userId){
UserAuth userAuth = this.getByUserId(userId);
int i = 0;
if(userAuth.getCarAuth().equals(AuditEnum.SUCCESS.getCode())){
i++;
}
if(userAuth.getMarriageAuth().equals(AuditEnum.SUCCESS.getCode())){
i++;
}
if(userAuth.getEducationAuth().equals(AuditEnum.SUCCESS.getCode())){
i++;
}
if(userAuth.getJobAuth().equals(AuditEnum.SUCCESS.getCode())){
i++;
}
if(userAuth.getPhoneAuth().equals(AuditEnum.SUCCESS.getCode())){
i++;
}
if(userAuth.getSinglePersonAuth().equals(AuditEnum.SUCCESS.getCode())){
i++;
}
if(userAuth.getHouseAuth().equals(AuditEnum.SUCCESS.getCode())){
i++;
}
if(userAuth.getCardNumAuth().equals(AuditEnum.SUCCESS.getCode())){
i++;
}
this.update(Wrappers.lambdaUpdate(UserAuth.class).eq(UserAuth::getId, userAuth.getId())
.set(UserAuth::getAlreadyAuthNum, i));
}
}

35
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserInfoServiceImpl.java
View File

@@ -4,10 +4,12 @@ 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.common.core.domain.PageQuery;
import com.ruoyi.common.utils.BeanConvertUtil;
import com.ruoyi.xq.domain.User;
import com.ruoyi.xq.domain.UserInfo;
import com.ruoyi.xq.dto.admin.user.UserInfoDetailAdminVo;
import com.ruoyi.xq.dto.admin.user.UserInfoListAdminVo;
import com.ruoyi.xq.dto.admin.user.req.UpdateUserInfoReq;
import com.ruoyi.xq.mapper.UserInfoMapper;
import com.ruoyi.xq.service.UserInfoService;
import com.ruoyi.xq.service.UserService;
@@ -15,7 +17,9 @@ import com.ruoyi.xq.util.AgeUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.List;
/**
@@ -52,13 +56,32 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper,UserInfo> im
}
@Override
public UserInfoDetailAdminVo fullUserInfo(Long userId) {
UserInfoDetailAdminVo vo = new UserInfoDetailAdminVo();
public UpdateUserInfoReq getUserInfoUpdate(Long userId) {
User user = userService.getById(userId);
UserInfo userInfo = this.getByUserId(userId);
user.setAge(AgeUtil.getAge(user.getBirthday()));
vo.setUser(user);
vo.setUserInfo(userInfo);
return vo;
UpdateUserInfoReq res = BeanConvertUtil.convertTo(user, UpdateUserInfoReq::new);
BeanConvertUtil.copyProperties(userInfo, res);
return res;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updateInfo(UpdateUserInfoReq bo) {
User user = new User();
user.setId(bo.getUserId());
user.setUpdateTime(LocalDateTime.now());
BeanConvertUtil.copyProperties(bo, user);
user.setMobile(null);
userService.updateById(user);
UserInfo userInnnn = this.getByUserId(bo.getUserId());
UserInfo userInfo = new UserInfo();
userInfo.setId(userInnnn.getId());
userInfo.setUpdateTime(LocalDateTime.now());
BeanConvertUtil.copyProperties(bo, userInfo);
userInfo.setUserId(null);
this.updateById(userInfo);
}
}

14
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java
View File

@@ -30,6 +30,7 @@ import com.ruoyi.xq.manager.LoginManager;
import com.ruoyi.xq.manager.SystemConfigManager;
import com.ruoyi.xq.mapper.UserMapper;
import com.ruoyi.xq.service.*;
import com.ruoyi.xq.util.AgeUtil;
import com.ruoyi.xq.util.BirthdayUtil;
import com.ruoyi.xq.util.ShowAvatarUtil;
import com.ruoyi.yunxin.client.ImUserRefClient;
@@ -321,6 +322,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper,User> implements Use
@Override
@Transactional(rollbackFor = Exception.class)
public void saveUser(AddUserReq bo) {
boolean mobile = PhoneUtil.isMobile(bo.getMobile());
if(!mobile){
throw new ServiceException("请填写正确的手机号格式");
}
User user = this.getByMobile(bo.getMobile());
if(user != null){
throw new ServiceException("手机号已存在!");
@@ -338,7 +343,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper,User> implements Use
}
user = loginManager.registerUser(bo.getMobile(), null);
UpdateUserReq updateUser = BeanConvertUtil.convertTo(bo, UpdateUserReq::new);
updateUser.setUserId(user.getId());
updateUser.setId(user.getId());
UserService userService = SpringUtil.getBean(UserService.class);
userService.updateBaseUser(updateUser);
}finally {
@@ -350,18 +355,21 @@ public class UserServiceImpl extends ServiceImpl<UserMapper,User> implements Use
@Override
@Transactional(rollbackFor = Exception.class)
public void updateBaseUser(UpdateUserReq updateUserReq){
User user = this.getById(updateUserReq.getUserId());
User user = this.getById(updateUserReq.getId());
if(user == null){
throw new ServiceException("用户不存在!");
}
User updateUser = new User();
updateUser.setId(user.getId());
updateUser.setType(updateUserReq.getUserType());
updateUser.setType(updateUserReq.getType());
updateUser.setNickname(updateUserReq.getNickname());
updateUser.setAvatar(updateUserReq.getAvatar());
updateUser.setGender(updateUserReq.getGender());
updateUser.setHeight(updateUserReq.getHeight());
updateUser.setWeight(updateUserReq.getWeight());
if(updateUserReq.getBirthday() != null){
updateUser.setAge(AgeUtil.getAge(updateUserReq.getBirthday()));
}
updateUser.setBirthday(updateUserReq.getBirthday());
if(updateUserReq.getResidenceCode() != null){
updateUser.setResidenceCode(updateUserReq.getResidenceCode());