From a06001d130f3b088a1afbd7d7dc8616d209a9fd5 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 23 五月 2019 11:23:14 +0800
Subject: [PATCH] 更换头像时  清除用户的邀请图片

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 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 c13d69d..c0a3b20 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
@@ -925,7 +925,7 @@
 		phone = phone.replaceAll(" ", "");
 
 		// 鑻规灉搴旂敤鍟嗗簵涓婄嚎娴嬭瘯鍙风爜
-		if ("17316780233".equalsIgnoreCase(phone) && "258168".equalsIgnoreCase(vcode)) {
+		if ("17316780233".equalsIgnoreCase(phone) && "2581".equalsIgnoreCase(vcode)) {
 			;
 		} else {
 
@@ -1135,14 +1135,19 @@
 		updateUserInfo.setWxOpenId(weiXinUser.getOpenid());
 		updateUserInfo.setWxPic(weiXinUser.getHeadimgurl());
 		updateUserInfo.setWxUnionId(weiXinUser.getUnionid());
-		updateUserInfo.setNickName(weiXinUser.getNickname());
-		updateUserInfo.setPortrait(weiXinUser.getHeadimgurl());
-		if (StringUtil.isNullOrEmpty(weiXinUser.getNickname())) {
-			updateUserInfo.setNickName(Constant.systemCommonConfig.getDefaultNickName());
-		}
-
-		if (StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl())) {
-			updateUserInfo.setPortrait(Constant.systemCommonConfig.getDefaultPortrait());
+		
+		// 灏嗛粯璁ゆ樀绉版浛鎹㈡垚寰俊鏄电О
+		String defaultNickName = Constant.systemCommonConfig.getDefaultNickName();
+		if (!StringUtil.isNullOrEmpty(weiXinUser.getNickname()) && !StringUtil.isNullOrEmpty(defaultNickName)
+				&& defaultNickName.equals(user.getNickName())) {
+			updateUserInfo.setNickName(weiXinUser.getNickname());
+		} 
+		
+		// 灏嗛粯璁ゅご鍍忔浛鎹㈡垚寰俊澶村儚
+		String defaultPortrait = Constant.systemCommonConfig.getDefaultPortrait();
+		if (!StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl()) && !StringUtil.isNullOrEmpty(defaultPortrait)
+				&& defaultPortrait.equals(user.getPortrait())) {
+			updateUserInfo.setPortrait(weiXinUser.getHeadimgurl());
 		}
 		userInfoMapper.updateByPrimaryKeySelective(updateUserInfo);
 

--
Gitblit v1.8.0