From 3e02abec44a648f01174a4c3494a96ccb46a3b1a Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 11 十一月 2025 21:39:20 +0800
Subject: [PATCH] 会员&充值相关模块
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 6 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..e2c875b 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.*;
@@ -196,7 +197,8 @@
us.setRoleId(user.getRoleId()); // 瑙掕壊ID锛�102=瀹跺涵鎴愬憳锛�
us.setSex(user.getSex()); // 鎬у埆锛�0鐢�/1濂筹級
us.setStatus(user.getStatus()); // 璐︽埛鐘舵�侊紙鍚敤/绂佺敤锛�
- us.setRemark(user.getRemark()); // 澶囨敞淇℃伅
+ us.setRemark(user.getRemark());
+ us.setEmail(user.getEmail());// 澶囨敞淇℃伅
userService.updateUser(us); // 鎵цSysUser琛ㄦ洿鏂�
// ===== 2. 瀹跺涵鎴愬憳涓撳睘澶勭悊锛堜粎瑙掕壊ID=102鏃舵墽琛岋級=====
@@ -208,7 +210,8 @@
infoUser.setNickName(user.getNickName()); // 褰撳墠鏄电О
infoUser.setIsMyFamily(user.getIsMyFamily()); // 瀹跺涵鎴愬憳鏍囪锛�0/1锛�
infoUser.setMomId(user.getMid()); // 姣嶄翰ID锛堝彲涓虹┖锛�
- infoUser.setFatherId(user.getFid()); // 鐖朵翰ID锛堝彲涓虹┖锛�
+ infoUser.setFatherId(user.getFid());
+ infoUser.setEmail(user.getEmail());// 鐖朵翰ID锛堝彲涓虹┖锛�
// 濠氬Щ鐘舵�佺┖鍊间繚鎶わ紙0鏈/1宸插/2绂诲锛�
infoUser.setMaritalStatus(user.getMaritalStatus() == null ? null : user.getMaritalStatus());
// 鎬у埆鏍煎紡杞崲锛圫tring 鈫� Integer锛�
@@ -219,10 +222,29 @@
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);
Long myFamily = byId.getFamilyId();
+
+ //鑾峰彇鍚屼竴鐢ㄦ埛鐨勪俊鎭� 骞跺鍏惰繘琛屼慨鏀�
+ zInfoUserService.findByUaidToFaid(byId.getUaid())
+ .stream()
+ .filter(infoUser1 -> !infoUser1.getUserId().equals(infoUser.getUserId()))
+ .forEach(infoUser1 -> {
+ infoUser1.setOldName(infoUser.getOldName());
+ infoUser1.setMaritalStatus(infoUser.getMaritalStatus());
+ infoUser1.setSex(infoUser.getSex());
+ zInfoUserService.updateById(infoUser1);
+ });
+
// 淇濈暀鍘熷搴璉D锛堢‘淇濇暟鎹繛缁�э級
if (myFamily != null) infoUser.setFamilyId(myFamily);
@@ -318,7 +340,10 @@
marrySelfService.updateData(spouse); // 鎸佷箙鍖�
}
- // 3.4 绂诲鐗规畩澶勭悊锛堢姸鎬佺爜=2锛�
+
+
+
+ // 3.4 绂诲鐗规畩澶勭悊锛堢姸鎬佺爜=2锛�
if(user.getMaritalStatus() != null && user.getMaritalStatus() == 2) {
// 3.4.1 鑾峰彇閰嶅伓淇℃伅
Long spouseId = zInfoUserService.getById(user.getUserId()).getSpouseId();
@@ -388,6 +413,8 @@
user.setRemark(userAll.getRemark()); // 澶囨敞淇℃伅
user.setUpdateBy(userAll.getUpdateBy()); // 鏇存柊浜�
user.setClanId(userAll.getClanId()); // 瀹舵棌ID
+ user.setPaid(userAll.getPaid());
+ user.setEmail(userAll.getEmail());
// ===================== 2. 鍞竴鎬ф牎楠岋紙鐧诲綍鍚�/鎵嬫満鍙�/閭锛� =====================
// 2.1 鐧诲綍鍚嶆牎楠�
@@ -395,9 +422,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 +454,16 @@
infoUser.setNickName(userAll.getNickName()); // 褰撳墠鏄电О
infoUser.setOldName(userAll.getUserName()); // 鍘嗗彶鍚嶇О锛堜繚鐣欒褰曪級
infoUser.setPhoneNumber(userAll.getPhonenumber()); // 鑱旂郴鏂瑰紡
+ infoUser.setEmail(userAll.getEmail());
+ String originalString=userAll.getUserName()+"-"+userAll.getPhonenumber();
+
+ String uniqueId = UUID.nameUUIDFromBytes(originalString.getBytes()).toString();
+ infoUser.setUaid(uniqueId);
+
+ Boolean same = false;
+ if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
+ same = zInfoUserService.setUaidSame(user.getPhonenumber(), user.getUserName(), uniqueId);
+ }
// 鎬у埆鏍煎紡杞崲锛圫tring 鈫� Integer锛�
infoUser.setSex(userAll.getSex().equals("0") ? 0 : 1);
infoUser.setSpouseId(userAll.getSpouseId()); // 閰嶅伓ID
@@ -500,6 +538,12 @@
infoUser.setRoleId(3L); // 璁剧疆瀹跺涵瑙掕壊ID
zInfoUserService.save(infoUser); // 淇濆瓨瀹跺涵鎵╁睍淇℃伅
+ if(same){
+ zInfoUserService.setUserInfoSame(infoUser);
+ marrySelfService.setMarryInfoSame(infoUser,marrySelf.getId());
+
+ }
+
// 5.5.1 鏇存柊閰嶅伓鍏宠仈淇℃伅
if (userAll.getSpouseId() != null) {
ZInfoUser zu = new ZInfoUser();
--
Gitblit v1.9.1