From 3eebfae99d341c60b4af91765000a5e1399a1643 Mon Sep 17 00:00:00 2001
From: damonyuan <404054358@qq.com>
Date: Thu, 14 Nov 2024 18:09:50 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E8=A1=A5=E5=85=85=E6=BC=8F=E6=8E=89?=
 =?UTF-8?q?=E7=9A=84=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mdd/front/controller/UserController.java |  2 +-
 .../com/mdd/front/service/impl/UserServiceImpl.java   | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

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<Object> 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<User>()
+                    .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());