From 46c5e66ca3bb26bf2939c6328068d6a81b28b901 Mon Sep 17 00:00:00 2001
From: yiyan <thelongcode@163.com>
Date: Sat, 21 Dec 2019 19:54:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BE=AE=E4=BF=A1=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8Furl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ifish/dto/UserInfoDto.java        | 13 +++++++++++++
 src/main/java/com/ifish/entity/User.java            | 10 ----------
 .../java/com/ifish/serviceImpl/UserServiceImpl.java |  5 ++---
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/ifish/dto/UserInfoDto.java b/src/main/java/com/ifish/dto/UserInfoDto.java
index 406ef96..8b4bce3 100644
--- a/src/main/java/com/ifish/dto/UserInfoDto.java
+++ b/src/main/java/com/ifish/dto/UserInfoDto.java
@@ -18,6 +18,11 @@ public class UserInfoDto {
 	 */
 	private String unionId;
 
+	/**
+	 * 微信头像url
+	 */
+	private String wechatImgUrl;
+
 	/**
 	 * 手机号码
 	 */
@@ -163,4 +168,12 @@ public class UserInfoDto {
 	public void setUnionId(String unionId) {
 		this.unionId = unionId;
 	}
+
+	public String getWechatImgUrl() {
+		return wechatImgUrl;
+	}
+
+	public void setWechatImgUrl(String wechatImgUrl) {
+		this.wechatImgUrl = wechatImgUrl;
+	}
 }
diff --git a/src/main/java/com/ifish/entity/User.java b/src/main/java/com/ifish/entity/User.java
index fe47633..cb4425a 100644
--- a/src/main/java/com/ifish/entity/User.java
+++ b/src/main/java/com/ifish/entity/User.java
@@ -137,8 +137,6 @@ public class User implements Serializable{
 	@Column(name = "wechat_unionid")
 	private String wechatUnionid;
 
-	private String wechatImgUrl;
-
 	/**
 	 * 修改时间
 	 */
@@ -304,12 +302,4 @@ public class User implements Serializable{
 	public void setWechatUnionid(String wechatUnionid) {
 		this.wechatUnionid = wechatUnionid;
 	}
-
-	public String getWechatImgUrl() {
-		return wechatImgUrl;
-	}
-
-	public void setWechatImgUrl(String wechatImgUrl) {
-		this.wechatImgUrl = wechatImgUrl;
-	}
 }
diff --git a/src/main/java/com/ifish/serviceImpl/UserServiceImpl.java b/src/main/java/com/ifish/serviceImpl/UserServiceImpl.java
index 3887807..eee2c0c 100644
--- a/src/main/java/com/ifish/serviceImpl/UserServiceImpl.java
+++ b/src/main/java/com/ifish/serviceImpl/UserServiceImpl.java
@@ -378,6 +378,8 @@ public class UserServiceImpl implements UserService {
 		userDao.executeLoginUpdate(userId,user.getLoginType());
 		//用户基本信息
 		UserInfoDto userInfoDto = getUserInfoDto(user, gwellParam);
+		//微信头像
+		userInfoDto.setWechatImgUrl(headimgurl);
 		//用户资产信息
 		UserAssetDto userAssetDto = getUserAssetInfo(userId);
 		//返回json信息
@@ -389,8 +391,6 @@ public class UserServiceImpl implements UserService {
 		/**
 		 * 登录返回信息
 		 */
-		//微信头像
-		user.setWechatImgUrl(headimgurl);
 		//用户信息
 		json.put("user", getUserInfo(user,gwellParam));
 		//用户资产
@@ -1287,7 +1287,6 @@ public class UserServiceImpl implements UserService {
 		json.put("gwellUserID", user.getGwellUserID());
 		json.put("neteaseToken", user.getNeteaseToken());
 		json.put("userType", user.getUserType());
-		json.put("wechatImgUrl", user.getWechatImgUrl());
 		json.put("shopsUserId", user.getShopsUserId());
 		return json;
 	}