From 8190823a593d3123384d3a75774ad19ecea07204 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Mon, 15 Jun 2020 11:20:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
index 45c4f31..160a646 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
@@ -275,6 +275,7 @@
                                 SysUser user = new SysUser();
                                 user.setId(id);
                                 user.setMobile(newTel);
+                                user.setUsername(newTel);
                                 //修改doctor表
                                 com.kidgrow.usercenter.model.SysDoctor sysDoctorModel= findDoctorByUserId(user.getId());
                                 com.kidgrow.usercenter.model.SysDoctor newsysDoctorModel= new com.kidgrow.usercenter.model.SysDoctor();
@@ -284,8 +285,9 @@
                                     newsysDoctorModel.setDoctorTel(newTel);
                                     sysDoctorMapper.updateById(newsysDoctorModel);
                                 }
-
                                 if (baseMapper.updateById(user) > 0) {
+                                    //将Redis清除
+                                    redisUtils.hdel(ConstantSMS.PHONE_SMS,newTel);
                                     return ResultBody.ok().msg("手机号修改成功!");
                                 } else {
                                     return ResultBody.failed("手机号修改失败!");
@@ -536,6 +538,9 @@
         if (StringUtils.isBlank(phone)) {
             return ResultBody.failed("请输入新手机号");
         }
+        if(!sysUser.getMobile().equals(password)){
+            return ResultBody.failed("请输入原手机号");
+        }
         String verificationCode = MapUtils.getString(map, "verificationCode");
         if (StringUtils.isBlank(verificationCode)) {
             return ResultBody.failed("请输入验证码");

--
Gitblit v1.8.0