|
@@ -274,14 +274,14 @@ public class MemberAuthServiceImpl implements MemberAuthService {
|
|
|
public void sendSmsCode(Long userId, AppAuthSmsSendReqVO reqVO) {
|
|
|
// 情况 1:如果是修改手机场景,需要校验新手机号是否已经注册,说明不能使用该手机了
|
|
|
if (Objects.equals(reqVO.getScene(), SmsSceneEnum.MEMBER_UPDATE_MOBILE.getScene())) {
|
|
|
- MemberUserDO user = userService.getUserByMobile(reqVO.getMobile());
|
|
|
- if (user != null && !Objects.equals(user.getId(), userId)) {
|
|
|
- throw exception(AUTH_MOBILE_USED);
|
|
|
+ MemberUserDO user = userService.getUserByMobile(reqVO.getMobile(),userId);
|
|
|
+ if (user == null) {
|
|
|
+ throw exception(USER_MOBILE_IS_ERROR);
|
|
|
}
|
|
|
}
|
|
|
// 情况 2:如果是重置密码场景,需要校验手机号是存在的
|
|
|
if (Objects.equals(reqVO.getScene(), SmsSceneEnum.MEMBER_RESET_PASSWORD.getScene())) {
|
|
|
- MemberUserDO user = userService.getUserByMobile(reqVO.getMobile());
|
|
|
+ MemberUserDO user = userService.getUserByMobile(reqVO.getMobile(),userId);
|
|
|
if (user == null) {
|
|
|
throw exception(USER_MOBILE_NOT_EXISTS);
|
|
|
}
|
|
@@ -292,6 +292,10 @@ public class MemberAuthServiceImpl implements MemberAuthService {
|
|
|
// TODO 非繁人:后续 member user 手机非强绑定,这块需要做下调整;
|
|
|
reqVO.setMobile(user.getMobile());
|
|
|
}
|
|
|
+ //情况 4:如果是修改手机号时,输入新的手机号,需要校验手机号是否绑定上限
|
|
|
+ if(Objects.equals(reqVO.getScene(), SmsSceneEnum.MEMBER_UPDATE_NEW_MOBILE.getScene())){
|
|
|
+ verifyMobileIsMaximize(reqVO.getMobile());
|
|
|
+ }
|
|
|
|
|
|
// 执行发送
|
|
|
smsCodeApi.sendSmsCode(AuthConvert.INSTANCE.convert(reqVO).setCreateIp(getClientIP()));
|