From b02beccf4567068cb47a3f1181a00039456c872d Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期三, 06 八月 2025 15:37:20 +0800
Subject: [PATCH] 用户修改姓名和电话同步修改uaid
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 4 ++++
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 15 ++++++++++++++-
zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java | 3 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 24 +++++++++++++++++++++---
zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java | 2 ++
5 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 78cc9c5..2aada8a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -13,6 +13,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.entity.sysUserInfo;
+import com.ruoyi.common.utils.uuid.UUID;
import com.ruoyi.domain.*;
import com.ruoyi.domain.dto.MarryInfoDto;
import com.ruoyi.service.*;
@@ -219,6 +220,13 @@
infoUser.setSpouseId(user.getSpouseId());
}
+ String originalString=user.getUserName()+"-"+user.getPhonenumber();
+
+ String uniqueId = UUID.nameUUIDFromBytes(originalString.getBytes()).toString();
+ infoUser.setUaid(uniqueId);
+ zInfoUserService.setUaidSame(user.getPhonenumber(),user.getUserName(),uniqueId);
+
+
// ----- 2.2 瀹舵棌鍏崇郴缁ф壙閫昏緫 -----
// 浼樺厛鑾峰彇褰撳墠鏁版嵁搴撹褰�
ZInfoUser byId = zInfoUserService.getById(user);
@@ -388,6 +396,7 @@
user.setRemark(userAll.getRemark()); // 澶囨敞淇℃伅
user.setUpdateBy(userAll.getUpdateBy()); // 鏇存柊浜�
user.setClanId(userAll.getClanId()); // 瀹舵棌ID
+ user.setPaid(userAll.getPaid());
// ===================== 2. 鍞竴鎬ф牎楠岋紙鐧诲綍鍚�/鎵嬫満鍙�/閭锛� =====================
// 2.1 鐧诲綍鍚嶆牎楠�
@@ -395,9 +404,10 @@
return error("鏂板鐢ㄦ埛'" + user.getNickName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
}
// 2.2 鎵嬫満鍙锋牎楠岋紙闈炵┖鏃堕獙璇侊級
- else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
- return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
- }
+// else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
+//
+// return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
+// }
// 2.3 閭鏍￠獙锛堥潪绌烘椂楠岃瘉锛�
else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
@@ -426,6 +436,14 @@
infoUser.setNickName(userAll.getNickName()); // 褰撳墠鏄电О
infoUser.setOldName(userAll.getUserName()); // 鍘嗗彶鍚嶇О锛堜繚鐣欒褰曪級
infoUser.setPhoneNumber(userAll.getPhonenumber()); // 鑱旂郴鏂瑰紡
+
+ String originalString=userAll.getUserName()+"-"+userAll.getPhonenumber();
+
+ String uniqueId = UUID.nameUUIDFromBytes(originalString.getBytes()).toString();
+ infoUser.setUaid(uniqueId);
+ if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
+ zInfoUserService.setUaidSame(user.getPhonenumber(),user.getUserName(),uniqueId);
+ }
// 鎬у埆鏍煎紡杞崲锛圫tring 鈫� Integer锛�
infoUser.setSex(userAll.getSex().equals("0") ? 0 : 1);
infoUser.setSpouseId(userAll.getSpouseId()); // 閰嶅伓ID
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index b95c2a2..bb427f2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.domain.ZInfoUser;
@@ -78,6 +79,9 @@
@Resource
private ZInfoUserService zInfoUserService;
+
+
+
@Override
public List<String> findUserNames(Long[] ids) {
List<String> usNames = userMapper.findUserNames(ids).stream().map(SysUser::getUserName).collect(Collectors.toList());
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java b/zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java
index 7579279..dabf4b9 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/sysUserAndUserInfo.java
@@ -78,4 +78,7 @@
/** 濠氬Щ鐘跺喌(0:鏈,1:宸插,2:绂诲) */
private Integer maritalStatus;
+
+ /** 鏄惁浼氬憳(0鍚� 1鏄�) 榛樿鍚�*/
+ private Integer paid;
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
index 32b36e4..2eaffaa 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
@@ -22,6 +22,8 @@
public interface ZInfoUserService extends IService<ZInfoUser> {
+ void setUaidSame(String phone, String username,String uniqueId);
+
void setSpouseOnly(Long spouse);
AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
index f6a9cf7..38f984b 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -12,6 +11,7 @@
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.uuid.UUID;
import com.ruoyi.domain.*;
import com.ruoyi.domain.dto.*;
import com.ruoyi.mapper.ZInfoUserMapper;
@@ -54,6 +54,19 @@
private ZfClanService zfClanService;
+
+ /** 浣跨浉鍚岀敤鎴峰悕+鐢佃瘽鍙风爜鐩稿悓鐨勭敤鎴峰搴旂殑uaid鍚屾*/
+ @Override
+ public void setUaidSame(String phone, String username,String uniqueId){
+ UpdateWrapper<ZInfoUser> wrapper = new UpdateWrapper<>();
+ wrapper.eq(phone!=null,"phone_number", phone)
+ .eq(username!=null,"old_name",username)
+ .set("uaid",uniqueId );
+ this.update(null, wrapper); // 鎵ц鏇存柊
+ }
+
+
+
@Override
public void setSpouseOnly(Long spouse){
UpdateWrapper<ZInfoUser> wrapper = new UpdateWrapper<>();
--
Gitblit v1.9.1