From b507ff6683e0971abc742a64d275ef5ffd4c5c81 Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Thu, 11 Apr 2024 16:32:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E9=82=AE=E7=AE=B1-=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=B7=B2=E7=BB=91=E5=AE=9A=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../book/controller/MyUserController.java     | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/peanut/modules/book/controller/MyUserController.java b/src/main/java/com/peanut/modules/book/controller/MyUserController.java
index 9065e845..782d1fb2 100644
--- a/src/main/java/com/peanut/modules/book/controller/MyUserController.java
+++ b/src/main/java/com/peanut/modules/book/controller/MyUserController.java
@@ -279,19 +279,26 @@ public class MyUserController {
         String email = map.get("email").toString();
         String code = map.get("code").toString();
         Integer id = Integer.valueOf(map.get("id").toString());
-        String redisCode = redisTemplate.opsForValue().get("RegistCode"+email);
-        if(StringUtils.isEmpty(redisCode)){
-            return R.error("验证码已过期，请重试");
+        //查询是否存在当前邮箱
+        LambdaQueryWrapper<MyUserEntity> wrapper = new LambdaQueryWrapper();
+        wrapper.eq(MyUserEntity::getEmail,email);
+        MyUserEntity userEntity = userService.getOne(wrapper);
+        if (userEntity == null) {
+            String redisCode = redisTemplate.opsForValue().get("RegistCode"+email);
+            if(StringUtils.isEmpty(redisCode)){
+                return R.error("验证码已过期，请重试");
+            }
+            String lcode = redisCode.split("_")[0];
+            if (!lcode.equals(code)) {
+                return R.error("短信验证码不符！");
+            }
+            MyUserEntity userInfo = userService.getById(id);
+            userInfo.setEmail(email);
+            userService.updateById(userInfo);
+            return R.ok();
+        }else {
+            return R.error("邮箱已被绑定！");
         }
-        String lcode = redisCode.split("_")[0];
-        if (!lcode.equals(code)) {
-            return R.error("短信验证码不符！");
-        }
-        MyUserEntity userInfo = userService.getById(id);
-        userInfo.setEmail(email);
-        userService.updateById(userInfo);
-        return R.ok();
-
     }
 
     @RequestMapping("/register")