diff --git a/server/like-front/src/main/java/com/mdd/front/controller/UserController.java b/server/like-front/src/main/java/com/mdd/front/controller/UserController.java index 1f8bba24..9c1bf71e 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/UserController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/UserController.java @@ -94,7 +94,7 @@ public class UserController { return AjaxResult.success(); } - @PostMapping("/mnpMobile") + @PostMapping("/getMobileByMnp") @ApiOperation(value="微信手机号") public AjaxResult mnpMobile(@Validated @RequestBody UserPhoneMnpValidate mobileValidate) { iUserService.mnpMobile(mobileValidate.getCode().trim()); diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java index 38f1a7ee..1d432b99 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java @@ -307,6 +307,17 @@ public class UserServiceImpl implements IUserService { WxMaPhoneNumberInfo wxMaPhoneNumberInfo = wxMaService.getUserService().getNewPhoneNoInfo(code); Integer userId = LikeFrontThreadLocal.getUserId(); + + User userCheck = userMapper.selectOne(new QueryWrapper() + .select("id,account,mobile") + .eq("mobile", wxMaPhoneNumberInfo.getPhoneNumber()) + .isNull("delete_time") + .last("limit 1")); + + if (StringUtils.isNotNull(userCheck) && userCheck.getId().equals(userId) == false) { + throw new OperateException("手机号已被其它账号绑定!"); + } + User user = new User(); user.setId(userId); user.setMobile(wxMaPhoneNumberInfo.getPhoneNumber());