moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

后台-用户信息-邮箱

Browse Source
This commit is contained in:
khalil
2025-06-03 15:43:28 +08:00
parent ba0a5a9539
commit 46ede31d06
1 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/UserCheckAdminService.java
View File

@@ -98,15 +98,18 @@ public class UserCheckAdminService {
public List<UsersAdminVo> getUsersList(String erbanNoList,Integer type){
List<String> oldList = Arrays.asList(erbanNoList.split(","));
if(type == 1){
// 根据平台号寻找
return getUserListByErbanNoList(oldList);
}else if(type == 4){
return this.getUserListByUidList(oldList);
}else{
// 根据手机号寻找或根据支付宝账号寻找，以type为基准
return getUserListByList(oldList,type);
}
return switch (type) {
case 1 ->
// 根据平台号寻找
getUserListByErbanNoList(oldList);
case 2,3 ->
// 根据手机号寻找
getUserListByList(oldList, type);
case 4 ->
getUserListByUidList(oldList);
default ->
throw new AdminServiceException(BusiStatus.PARAMERROR);
};
}
private List<UsersAdminVo> getUserListByUidList(List<String> uidList){
@@ -121,6 +124,8 @@ public class UserCheckAdminService {
for(Account myAccount: accountList){
// 获取Users信息
UserVo myUser = usersService.getUserVoByUid(myAccount.getUid());
myUser.setPhoneAreaCode(myAccount.getPhoneAreaCode());
myUser.setPhone(CommonUtil.checkPhoneFormat(myAccount.getPhoneAreaCode(), myAccount.getPhone())? myAccount.getPhone(): null);
UsersAdminVo usersAdminVo = this.buildUsersAdminVo(myAccount, myUser);
list.add(usersAdminVo);
@@ -146,8 +151,8 @@ public class UserCheckAdminService {
for(Account myAccount: accountList){
// 获取Users信息
UserVo myUser = usersService.getUserVoByUid(myAccount.getUid());
myUser.setPhone(myAccount.getPhone());
myUser.setPhoneAreaCode(myAccount.getPhoneAreaCode());
myUser.setPhone(CommonUtil.checkPhoneFormat(myAccount.getPhoneAreaCode(), myAccount.getPhone())? myAccount.getPhone(): null);
UsersAdminVo usersAdminVo = this.buildUsersAdminVo(myAccount, myUser);
list.add(usersAdminVo);
@@ -170,10 +175,12 @@ public class UserCheckAdminService {
return Lists.newArrayList();
}
for(Users myUsers:usersList){
Account account = accountService.getById(myUsers.getUid());
UserVo myUsersVo = usersService.getUserVoByUid(myUsers.getUid());
Account myAccount = accountService.getById(myUsers.getUid());
UserVo myUser = usersService.getUserVoByUid(myUsers.getUid());
myUser.setPhoneAreaCode(myAccount.getPhoneAreaCode());
myUser.setPhone(CommonUtil.checkPhoneFormat(myAccount.getPhoneAreaCode(), myAccount.getPhone())? myAccount.getPhone(): null);
UsersAdminVo usersAdminVo = this.buildUsersAdminVo(account, myUsersVo);
UsersAdminVo usersAdminVo = this.buildUsersAdminVo(myAccount, myUser);
list.add(usersAdminVo);
}
return list;
@@ -194,17 +201,32 @@ public class UserCheckAdminService {
public UsersAdminVo getOne(Long uid){
if(uid != null){
UsersAdminVo usersAdminVo = new UsersAdminVo();
usersAdminVo.setUserPurseVo(userPurseService.queryUserPurseVo(uid));
usersAdminVo.setUsers(usersService.getUserVoByUid(uid));
usersAdminVo.setAccount(accountService.getById(uid));
// 最近登录记录
AccountLoginRecord accountLoginRecord = accountLoginRecordService.getLastLoginRecord(uid);
usersAdminVo.setAccountLoginRecord(accountLoginRecord);
return usersAdminVo;
if (null == uid){
return null;
}
return null;
UserVo userVo = usersService.getUserVoByUid(uid);
if (null == userVo){
return null;
}
Account account = accountService.getById(uid);
if (null == account){
return null;
}
userVo.setPhoneAreaCode(account.getPhoneAreaCode());
userVo.setPhone(CommonUtil.checkPhoneFormat(account.getPhoneAreaCode(), account.getPhone())? account.getPhone(): null);
UsersAdminVo usersAdminVo = new UsersAdminVo();
usersAdminVo.setAccount(account);
usersAdminVo.setUsers(userVo);
usersAdminVo.setUserPurseVo(userPurseService.queryUserPurseVo(uid));
// 最近登录记录
AccountLoginRecord accountLoginRecord = accountLoginRecordService.getLastLoginRecord(uid);
usersAdminVo.setAccountLoginRecord(accountLoginRecord);
return usersAdminVo;
}
@Transactional(rollbackFor = Exception.class)
public Users saveUser(String nick, int gender, String avatar, Long uid, String phoneAreaCode, String phone, String email,