From cc595b0aa24773735417accd0158da6ac98a6db0 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 30 六月 2022 14:47:56 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 9cbf705..a86685c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -250,17 +250,20 @@
*/
@Override
public R updateUserWeiXinPhone(Long userId, String purePhoneNumber) {
- SysUserDO sysUserDO = new SysUserDO();
- sysUserDO.setPhone(purePhoneNumber);
- sysUserDO.setUserId(userId);
- userDao.updateMemberRole(purePhoneNumber, purePhoneNumber);
- userDao.updateServiceTeam(purePhoneNumber, purePhoneNumber);
- int i = userDao.updateById(sysUserDO);
- if (i > 0) {
- return R.ok(purePhoneNumber);
- } else {
- return R.fail("维护微信手机号失败");
+ SysUserDO sysUserDO=userDao.selectById(userId);
+ if(sysUserDO!=null){
+ userDao.updateMemberRole(purePhoneNumber, sysUserDO.getPhone());
+ userDao.updateServiceTeam(purePhoneNumber, sysUserDO.getPhone());
+ sysUserDO.setPhone(purePhoneNumber);
+ sysUserDO.setUserId(userId);
+ int i = userDao.updateById(sysUserDO);
+ if (i > 0) {
+ return R.ok(purePhoneNumber);
+ } else {
+ return R.fail("维护微信手机号失败");
+ }
}
+ return R.ok(sysUserDO.getPhone());
}
/**
--
Gitblit v1.7.1