From 34b542007f7e0dd4e1fdffecbd12a377aa953d68 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期一, 02 九月 2019 17:22:16 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java index d24e104..34dce2f 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java @@ -849,11 +849,14 @@ updateUserInfo.setWxOpenId(weiXinUser.getOpenid()); updateUserInfo.setWxPic(weiXinUser.getHeadimgurl()); updateUserInfo.setWxUnionId(weiXinUser.getUnionid()); + // 灏嗛粯璁ゆ樀绉版浛鎹㈡垚寰俊鏄电О String defaultNickName = Constant.systemCommonConfig.getDefaultNickName(); - if (!StringUtil.isNullOrEmpty(weiXinUser.getNickname()) && !StringUtil.isNullOrEmpty(defaultNickName) - && (defaultNickName.equals(user.getNickName()) || "杩斿埄鍒�".equals(user.getNickName()))) { - updateUserInfo.setNickName(weiXinUser.getNickname()); + if (!StringUtil.isNullOrEmpty(defaultNickName) && !StringUtil.isNullOrEmpty(weiXinUser.getNickname())) { + defaultNickName = defaultNickName + uid; + if ((defaultNickName.equals(user.getNickName()) || "杩斿埄鍒�".equals(user.getNickName()))) { + updateUserInfo.setNickName(weiXinUser.getNickname()); + } } // 灏嗛粯璁ゅご鍍忔浛鎹㈡垚寰俊澶村儚 @@ -1240,11 +1243,13 @@ // 灏嗛粯璁ゆ樀绉版浛鎹㈡垚寰俊鏄电О String defaultNickName = Constant.systemCommonConfig.getDefaultNickName(); - if (!StringUtil.isNullOrEmpty(weiXinUser.getNickname()) && !StringUtil.isNullOrEmpty(defaultNickName) - && (defaultNickName.equals(user.getNickName()) || "杩斿埄鍒�".equals(user.getNickName()))) { - updateUserInfo.setNickName(weiXinUser.getNickname()); + if (!StringUtil.isNullOrEmpty(defaultNickName) && !StringUtil.isNullOrEmpty(weiXinUser.getNickname())) { + defaultNickName = defaultNickName + uid; + if ((defaultNickName.equals(user.getNickName()) || "杩斿埄鍒�".equals(user.getNickName()))) { + updateUserInfo.setNickName(weiXinUser.getNickname()); + } } - + // 灏嗛粯璁ゅご鍍忔浛鎹㈡垚寰俊澶村儚 String defaultPortrait = Constant.systemCommonConfig.getDefaultPortrait(); if (!StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl()) && !StringUtil.isNullOrEmpty(defaultPortrait) -- Gitblit v1.8.0