diff --git a/src/HttpServer/logic/datadef.go b/src/HttpServer/logic/datadef.go
index 7498f42..ded877d 100644
--- a/src/HttpServer/logic/datadef.go
+++ b/src/HttpServer/logic/datadef.go
@@ -577,6 +577,7 @@ type UserData struct {
 	Scene			int
 	Regtime			int
 	InviteUid		int
-
+	LoginTime		int
+	LoginDay		int
 }
 
diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go
index 8ef32d1..992e437 100644
--- a/src/HttpServer/logic/function.go
+++ b/src/HttpServer/logic/function.go
@@ -209,13 +209,13 @@ func SaveUserExt(extdata * UserData) error {
 	return err
 }
 
-func GetUserExt(uuid int) (*UserExtData,error) {
+func GetUserExt(uuid int) (*UserData,error) {
 	strval,err := redishandler.GetRedisClient().HGet(redis.USER_EXT_DATA, strconv.Itoa(uuid))
 	if err != nil {
 		logger.Error("GetUserExt failed,err=%v",err)
 		return nil,err
 	}
-	ext := new(UserExtData)
+	ext := new(UserData)
 	err = json.Unmarshal([]byte(strval), ext)
 	return ext,err
 }
@@ -589,9 +589,9 @@ func GetFfiendData(frienduuid int) *GetRecommendListInfo {
 	tmpinfo  := new(GetRecommendListInfo)
 	tmpinfo.Hot = tmpext.Hot
 	tmpinfo.Bean = tmpext.Bean
-	tmpinfo.Userid = tmpext.User_id
+	tmpinfo.Userid = tmpext.Userid
 	tmpinfo.Coin = tmpext.Coin
-	tmpinfo.Reg_time = tmpext.Reg_time
+	tmpinfo.Reg_time = tmpext.Regtime
 	tmpinfo.Lv = tmpext.Lv
 	tmpinfo.Exp = tmpext.Exp
 	tmpinfo.Nickname = tmpbasic.User_nickname
@@ -599,8 +599,8 @@ func GetFfiendData(frienduuid int) *GetRecommendListInfo {
 	tmpinfo.Cat_num = 0
 	tmpinfo.City = tmpbasic.User_city
 	tmpinfo.Gender = tmpbasic.User_gender
-	tmpinfo.Love_exp = tmpext.LoveExp
-	tmpinfo.Shop_num = tmpext.ShopNum
+	tmpinfo.Love_exp = tmpext.Loevexp
+	tmpinfo.Shop_num = tmpext.Shopnum
 	return tmpinfo
 }
 
@@ -700,9 +700,9 @@ func (flist *FriendList)GetRecommandFriendList(uuid,friendnum int) (*GetRecommen
 			var tmpinfo GetRecommendListInfo
 			tmpinfo.Hot = tmpext.Hot
 			tmpinfo.Bean = tmpext.Bean
-			tmpinfo.Userid = tmpext.User_id
+			tmpinfo.Userid = tmpext.Userid
 			tmpinfo.Coin = tmpext.Coin
-			tmpinfo.Reg_time = tmpext.Reg_time
+			tmpinfo.Reg_time = tmpext.Regtime
 			tmpinfo.Lv = tmpext.Lv
 			tmpinfo.Exp = tmpext.Exp
 			tmpinfo.Nickname = tmpbasic.User_nickname
@@ -710,8 +710,8 @@ func (flist *FriendList)GetRecommandFriendList(uuid,friendnum int) (*GetRecommen
 			tmpinfo.Cat_num = 0
 			tmpinfo.City = tmpbasic.User_city
 			tmpinfo.Gender = tmpbasic.User_gender
-			tmpinfo.Love_exp = tmpext.LoveExp
-			tmpinfo.Shop_num = tmpext.ShopNum
+			tmpinfo.Love_exp = tmpext.Loevexp
+			tmpinfo.Shop_num = tmpext.Shopnum
 			realrt.Recommend_list = append(realrt.Recommend_list,tmpinfo)
 
 		}
diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go
index d278077..44e05cc 100644
--- a/src/HttpServer/logic/logic.go
+++ b/src/HttpServer/logic/logic.go
@@ -59,6 +59,8 @@ func InitUserExt(req *UserLoginReq,resp *UserLoginResp,uuid int) {
 	udata.Userid = extdata.User_id
 	udata.UserInviteId = extdata.User_invite_uid
 	udata.Userregtime = extdata.User_reg_time
+	udata.LoginTime = int(time.Now().Unix())
+	udata.LoginDay = 1
 
 	SaveUserExt(udata)
 }
@@ -136,11 +138,42 @@ func InitWeChatUser(req *WechatLoginReq,resp *UserLoginResp,uinfo *WxUserInfo) {
 	udata.Userid = extdata.User_id
 	udata.UserInviteId = extdata.User_invite_uid
 	udata.Userregtime = extdata.User_reg_time
+	udata.LoginTime = int(time.Now().Unix())
+	udata.LoginDay = 1
 
 	SaveUserExt(udata)
 
 }
 
+//处理登陆数据
+func HandleLoginTime(ext *UserData) {
+	ext.LoginTime = int(time.Now().Unix())
+	timeStr := time.Now().Format("2006-01-02")
+	t, _ := time.Parse("2006-01-02", timeStr)
+	timeNumber := int(t.Unix() - 8*3600)
+	if timeNumber <= ext.LoginTime {
+		ext.LoginDay += 1
+	}
+}
+
+func TransmitUserData(in *UserData ,out *UserExtData) {
+	out.LoveExp = in.Loevexp
+	out.User_id = in.Userid
+	out.ShopNum = in.Shopnum
+	out.Exp = in.Exp
+	out.Lv = in.Lv
+	out.Reg_time = in.Regtime
+	out.Coin = in.Coin
+	out.Bean = in.Bean
+	out.Hot = in.Hot
+	out.User_reg_time = in.Userregtime
+	out.User_invite_uid = in.UserInviteId
+	out.User_is_black = in.Isblack
+	out.User_scene = in.Scene
+	out.User_channel = in.Channel
+	out.Invite_uid = in.InviteUid
+}
+
 //处理微信登录
 func HandleWechatlogin(w http.ResponseWriter, data string) {
 
@@ -186,11 +219,19 @@ func HandleWechatlogin(w http.ResponseWriter, data string) {
 				resp.Result.Code = ERROR_GETUSEREXTFAILED
 				break
 			}
-			resp.Result.Data.Extdata = *ext
+			TransmitUserData(ext,&resp.Result.Data.Extdata)
+			//resp.Result.Data.Extdata = *ext
 
-			m_userInfo.Set(uint32(ext.User_id),ext)
+			//需要处理登录数据
+			HandleLoginTime(ext)
+
+			m_userInfo.Set(uint32(ext.Userid),ext)
+			SaveUserExt(ext)
 		}
 
+
+
+
 		resp.Result.Code = ERROR_OK
 		break
 	}
@@ -226,9 +267,11 @@ func HandleTouristLogin(w http.ResponseWriter, req *UserLoginReq,resp *UserLogin
 				resp.Result.Code = ERROR_GETUSEREXTFAILED
 				break
 			}
-			resp.Result.Data.Extdata = *ext
+			//resp.Result.Data.Extdata = *ext
+			TransmitUserData(ext,&resp.Result.Data.Extdata)
 
-			m_userInfo.Set(uint32(ext.User_id),ext)
+			m_userInfo.Set(uint32(ext.Userid),ext)
+			SaveUserExt(ext)
 		}
 
 		resp.Result.Code = ERROR_OK
@@ -317,7 +360,8 @@ func HandleSaveUserData(w http.ResponseWriter, data string) {
 			resp.Result.Code = ERROR_GETUSEREXTFAILED
 			break
 		}
-		resp.Result.Data.Extdata = *ext
+		//resp.Result.Data.Extdata = *ext
+		TransmitUserData(ext,&resp.Result.Data.Extdata)
 
 		resp.Result.Code = ERROR_OK
 		break
@@ -1154,8 +1198,8 @@ func HandleGetDataByUserId(w http.ResponseWriter, data string) {
 
 		resp.Result.Data.Base_data = base
 		resp.Result.Data.User_base_data = *basic
-		resp.Result.Data.Extdata = *ext
-
+		//resp.Result.Data.Extdata = *ext
+		TransmitUserData(ext,&resp.Result.Data.Extdata)
 		resp.Result.Code = ERROR_OK
 		break
 	}
--
libgit2 0.21.0