From d86feaa385ac67b78519220b068c67f28c4eb81f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 18 八月 2026 14:31:02 +0800
Subject: [PATCH] chore(config): 更新服务器配置中的主机地址
---
yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java | 48 +++++++++++++++++++++++++++---------------------
1 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java b/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
index d596ab6..8294d93 100644
--- a/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
+++ b/yudao-module-member/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
@@ -2,10 +2,8 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.*;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
-import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserPageReqVO;
@@ -18,8 +16,6 @@
import cn.iocoder.yudao.module.member.mq.producer.user.MemberUserProducer;
import cn.iocoder.yudao.module.system.api.sms.SmsCodeApi;
import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeUseReqDTO;
-import cn.iocoder.yudao.module.system.api.social.SocialClientApi;
-import cn.iocoder.yudao.module.system.api.social.dto.SocialWxPhoneNumberInfoRespDTO;
import cn.iocoder.yudao.module.system.enums.sms.SmsSceneEnum;
import com.google.common.annotations.VisibleForTesting;
import lombok.extern.slf4j.Slf4j;
@@ -42,7 +38,7 @@
/**
* 浼氬憳 User Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Valid
@@ -54,9 +50,6 @@
@Resource
private SmsCodeApi smsCodeApi;
-
- @Resource
- private SocialClientApi socialClientApi;
@Resource
private PasswordEncoder passwordEncoder;
@@ -142,6 +135,12 @@
@Override
public void updateUser(Long userId, AppMemberUserUpdateReqVO reqVO) {
+ // 1.1 妫�娴嬬敤鎴锋槸鍚﹀瓨鍦�
+ validateUserExists(userId);
+ // 1.2 鏍￠獙鎵嬫満鏄惁宸茬粡琚粦瀹�
+ validateEmailUnique(userId, reqVO.getEmail());
+
+ // 2. 鏇存柊鐢ㄦ埛
MemberUserDO updateObj = BeanUtils.toBean(reqVO, MemberUserDO.class).setId(userId);
memberUserMapper.updateById(updateObj);
}
@@ -166,19 +165,6 @@
// 3. 鏇存柊鐢ㄦ埛鎵嬫満
memberUserMapper.updateById(MemberUserDO.builder().id(userId).mobile(reqVO.getMobile()).build());
- }
-
- @Override
- public void updateUserMobileByWeixin(Long userId, AppMemberUserUpdateMobileByWeixinReqVO reqVO) {
- // 1.1 鑾峰緱瀵瑰簲鐨勬墜鏈哄彿淇℃伅
- SocialWxPhoneNumberInfoRespDTO phoneNumberInfo = socialClientApi.getWxMaPhoneNumberInfo(
- UserTypeEnum.MEMBER.getValue(), reqVO.getCode());
- Assert.notNull(phoneNumberInfo, "鑾峰緱鎵嬫満淇℃伅澶辫触锛岀粨鏋滀负绌�");
- // 1.2 鏍￠獙鏂版墜鏈烘槸鍚﹀凡缁忚缁戝畾
- validateMobileUnique(userId, phoneNumberInfo.getPhoneNumber());
-
- // 2. 鏇存柊鐢ㄦ埛鎵嬫満
- memberUserMapper.updateById(MemberUserDO.builder().id(userId).mobile(phoneNumberInfo.getPhoneNumber()).build());
}
@Override
@@ -238,6 +224,8 @@
validateUserExists(updateReqVO.getId());
// 鏍￠獙鎵嬫満鍞竴
validateMobileUnique(updateReqVO.getId(), updateReqVO.getMobile());
+ // 鏍￠獙閭鍞竴
+ validateEmailUnique(updateReqVO.getId(), updateReqVO.getEmail());
// 鏇存柊
MemberUserDO updateObj = MemberUserConvert.INSTANCE.convert(updateReqVO);
@@ -274,6 +262,24 @@
}
}
+ @VisibleForTesting
+ void validateEmailUnique(Long id, String email) {
+ if (StrUtil.isBlank(email)) {
+ return;
+ }
+ MemberUserDO user = memberUserMapper.selectByEmail(email);
+ if (user == null) {
+ return;
+ }
+ // 濡傛灉 id 涓虹┖锛岃鏄庝笉鐢ㄦ瘮杈冩槸鍚︿负鐩稿悓 id 鐨勭敤鎴�
+ if (id == null) {
+ throw exception(USER_EMAIL_USED, email);
+ }
+ if (!user.getId().equals(id)) {
+ throw exception(USER_EMAIL_USED, email);
+ }
+ }
+
@Override
public PageResult<MemberUserDO> getUserPage(MemberUserPageReqVO pageReqVO) {
return memberUserMapper.selectPage(pageReqVO);
--
Gitblit v1.9.3