提交

陆恒
1 parent d067dff3
Showing 5 changed files with 100 additions and 0 deletions Show diff stats
src/HttpServer/logic/datadef.go
src/HttpServer/logic/errordef.go
src/HttpServer/logic/function.go
src/HttpServer/logic/httpserver.go
src/HttpServer/logic/logic.go
@@ -527,6 +527,25 @@ type DelFriendResp struct {
 	Result CommonResult `json:"result"`
 }
  
+type QueryPlayerDataReq struct{
+	Token string `json:"token"`
+	User_id int `json:"user_id"`
+}
+
+type QueryPlayerDataDesc struct {
+	Player_data GetRecommendListInfo `json:"player_data"`
+}
+
+type QueryPlayerDataResult struct {
+	Code int `json:"code"`
+	Data QueryPlayerDataDesc `json:"data"`
+}
+
+type QueryPlayerDataResp struct {
+	Status    string    `json:"status"`
+	Result QueryPlayerDataResult `json:"result"`
+}
+
 //**********************************************************************************************************
  
  
@@ -34,4 +34,5 @@ const (
 	ERROR_FRIENDAPPROVEFAILED = 29 //好友审批失败
 	ERROR_FRIENDNOTFRIEND = 30 //不是好友
 	ERROR_FRIENDDELFRIENDFAILED = 31 //删除好友失败
+	ERROR_FRIENDGETFRIENDINFOFAILED = 32 //获取好友信息失败
 )
 \ No newline at end of file
@@ -576,6 +576,34 @@ func DelCacheRecommandFriendList(uuid int) error {
 }
  
  
+func GetFfiendData(frienduuid int) *GetRecommendListInfo {
+	tmpext,err := GetUserExt(frienduuid)
+	if err != nil {
+		return nil
+	}
+	tmpbasic,err := GetUserBasic(frienduuid)
+	if err != nil {
+		return nil
+	}
+
+	tmpinfo  := new(GetRecommendListInfo)
+	tmpinfo.Hot = tmpext.Hot
+	tmpinfo.Bean = tmpext.Bean
+	tmpinfo.Userid = tmpext.User_id
+	tmpinfo.Coin = tmpext.Coin
+	tmpinfo.Reg_time = tmpext.Reg_time
+	tmpinfo.Lv = tmpext.Lv
+	tmpinfo.Exp = tmpext.Exp
+	tmpinfo.Nickname = tmpbasic.User_nickname
+	tmpinfo.Avatar_url = tmpbasic.User_avatar_url
+	tmpinfo.Cat_num = 0
+	tmpinfo.City = tmpbasic.User_city
+	tmpinfo.Gender = tmpbasic.User_gender
+	tmpinfo.Love_exp = tmpext.LoveExp
+	tmpinfo.Shop_num = tmpext.ShopNum
+	return tmpinfo
+}
+
 //获取推荐好友列表
 func (flist *FriendList)GetRecommandFriendList(uuid,friendnum int) (*GetRecommendListDesc,error) {
  
@@ -52,6 +52,7 @@ func startServerHttpServe() {
 	http.HandleFunc("/catcafe/friend/getRecommendList", GetRecommendList)                            //获取推荐好友列表
 	http.HandleFunc("/catcafe/friend/handleFriendRequest", HandleFriendRequest)                            //处理好友请求
 	http.HandleFunc("/catcafe/friend/delFriend", DelFriend)                            //删除好友
+	http.HandleFunc("/catcafe/friend/QueryPlayerData", QueryPlayerData)                            //根据用户id获取用户信息  好友用
  
  
 	err := http.ListenAndServe(conf.GetServerHttpAddrConf(), nil)
@@ -59,6 +60,18 @@ func startServerHttpServe() {
 }
  
  
+func QueryPlayerData(w http.ResponseWriter, r *http.Request) {
+
+	result, _ := ioutil.ReadAll(r.Body)
+	r.Body.Close()
+
+	s := string(result)
+	logger.Info("QueryPlayerData , body:%v,uuid=%v", s)
+
+	HandleQueryPlayerData(w,s)
+}
+
+
 func DelFriend(w http.ResponseWriter, r *http.Request) {
  
 	result, _ := ioutil.ReadAll(r.Body)
@@ -1489,4 +1489,43 @@ func HandleDelFriend(w http.ResponseWriter, data string) {
 	//回包
 	respstr, _ := json.Marshal(&resp)
 	fmt.Fprint(w, string(respstr))
+}
+
+func HandleQueryPlayerData(w http.ResponseWriter, data string) {
+	SetHeader(w)
+	var resp QueryPlayerDataResp
+	resp.Status = "true"
+	resp.Result.Code = ERROR_OK
+	var rdata QueryPlayerDataReq
+	err := json.Unmarshal([]byte(data), &rdata)
+	for {
+		if err != nil {
+			logger.Error("HandleQueryPlayerData json unmarshal failed=%v", err)
+			resp.Result.Code = ERROR_JSONUNMASHFAILED
+			break
+		}
+
+		uuid,err := GetTouristUid(rdata.Token)
+		if err != nil || uuid==0{
+			logger.Error("HandleQueryPlayerData GetTouristUid failed=%v", err)
+			resp.Result.Code = ERROR_GETUSERIDFAILED
+			break
+		}
+
+		finfo := GetFfiendData(rdata.User_id)
+		if finfo == nil {
+			logger.Error("HandleQueryPlayerData ERROR_FRIENDGETFRIENDINFOFAILED failed=%v", err)
+			resp.Result.Code = ERROR_FRIENDGETFRIENDINFOFAILED
+			break
+		}
+
+		resp.Result.Data.Player_data = *finfo
+
+		resp.Result.Code = ERROR_OK
+		break
+	}
+
+	//回包
+	respstr, _ := json.Marshal(&resp)
+	fmt.Fprint(w, string(respstr))
 }
 \ No newline at end of file
...	...	@@ -527,6 +527,25 @@ type DelFriendResp struct {
527	527	Result CommonResult `json:"result"`
528	528	}
529	529
	530	+type QueryPlayerDataReq struct{
	531	+ Token string `json:"token"`
	532	+ User_id int `json:"user_id"`
	533	+}
	534	+
	535	+type QueryPlayerDataDesc struct {
	536	+ Player_data GetRecommendListInfo `json:"player_data"`
	537	+}
	538	+
	539	+type QueryPlayerDataResult struct {
	540	+ Code int `json:"code"`
	541	+ Data QueryPlayerDataDesc `json:"data"`
	542	+}
	543	+
	544	+type QueryPlayerDataResp struct {
	545	+ Status string `json:"status"`
	546	+ Result QueryPlayerDataResult `json:"result"`
	547	+}
	548	+
530	549	//**********************************************************************************************************
531	550
532	551
...	...
...	...	@@ -34,4 +34,5 @@ const (
34	34	ERROR_FRIENDAPPROVEFAILED = 29 //好友审批失败
35	35	ERROR_FRIENDNOTFRIEND = 30 //不是好友
36	36	ERROR_FRIENDDELFRIENDFAILED = 31 //删除好友失败
	37	+ ERROR_FRIENDGETFRIENDINFOFAILED = 32 //获取好友信息失败
37	38	)
38	39	\ No newline at end of file
...	...
...	...	@@ -576,6 +576,34 @@ func DelCacheRecommandFriendList(uuid int) error {
576	576	}
577	577
578	578
	579	+func GetFfiendData(frienduuid int) *GetRecommendListInfo {
	580	+ tmpext,err := GetUserExt(frienduuid)
	581	+ if err != nil {
	582	+ return nil
	583	+ }
	584	+ tmpbasic,err := GetUserBasic(frienduuid)
	585	+ if err != nil {
	586	+ return nil
	587	+ }
	588	+
	589	+ tmpinfo := new(GetRecommendListInfo)
	590	+ tmpinfo.Hot = tmpext.Hot
	591	+ tmpinfo.Bean = tmpext.Bean
	592	+ tmpinfo.Userid = tmpext.User_id
	593	+ tmpinfo.Coin = tmpext.Coin
	594	+ tmpinfo.Reg_time = tmpext.Reg_time
	595	+ tmpinfo.Lv = tmpext.Lv
	596	+ tmpinfo.Exp = tmpext.Exp
	597	+ tmpinfo.Nickname = tmpbasic.User_nickname
	598	+ tmpinfo.Avatar_url = tmpbasic.User_avatar_url
	599	+ tmpinfo.Cat_num = 0
	600	+ tmpinfo.City = tmpbasic.User_city
	601	+ tmpinfo.Gender = tmpbasic.User_gender
	602	+ tmpinfo.Love_exp = tmpext.LoveExp
	603	+ tmpinfo.Shop_num = tmpext.ShopNum
	604	+ return tmpinfo
	605	+}
	606	+
579	607	//获取推荐好友列表
580	608	func (flist FriendList)GetRecommandFriendList(uuid,friendnum int) (GetRecommendListDesc,error) {
581	609
...	...
...	...	@@ -52,6 +52,7 @@ func startServerHttpServe() {
52	52	http.HandleFunc("/catcafe/friend/getRecommendList", GetRecommendList) //获取推荐好友列表
53	53	http.HandleFunc("/catcafe/friend/handleFriendRequest", HandleFriendRequest) //处理好友请求
54	54	http.HandleFunc("/catcafe/friend/delFriend", DelFriend) //删除好友
	55	+ http.HandleFunc("/catcafe/friend/QueryPlayerData", QueryPlayerData) //根据用户id获取用户信息好友用
55	56
56	57
57	58	err := http.ListenAndServe(conf.GetServerHttpAddrConf(), nil)
...	...	@@ -59,6 +60,18 @@ func startServerHttpServe() {
59	60	}
60	61
61	62
	63	+func QueryPlayerData(w http.ResponseWriter, r *http.Request) {
	64	+
	65	+ result, _ := ioutil.ReadAll(r.Body)
	66	+ r.Body.Close()
	67	+
	68	+ s := string(result)
	69	+ logger.Info("QueryPlayerData , body:%v,uuid=%v", s)
	70	+
	71	+ HandleQueryPlayerData(w,s)
	72	+}
	73	+
	74	+
62	75	func DelFriend(w http.ResponseWriter, r *http.Request) {
63	76
64	77	result, _ := ioutil.ReadAll(r.Body)
...	...
...	...	@@ -1489,4 +1489,43 @@ func HandleDelFriend(w http.ResponseWriter, data string) {
1489	1489	//回包
1490	1490	respstr, _ := json.Marshal(&resp)
1491	1491	fmt.Fprint(w, string(respstr))
	1492	+}
	1493	+
	1494	+func HandleQueryPlayerData(w http.ResponseWriter, data string) {
	1495	+ SetHeader(w)
	1496	+ var resp QueryPlayerDataResp
	1497	+ resp.Status = "true"
	1498	+ resp.Result.Code = ERROR_OK
	1499	+ var rdata QueryPlayerDataReq
	1500	+ err := json.Unmarshal([]byte(data), &rdata)
	1501	+ for {
	1502	+ if err != nil {
	1503	+ logger.Error("HandleQueryPlayerData json unmarshal failed=%v", err)
	1504	+ resp.Result.Code = ERROR_JSONUNMASHFAILED
	1505	+ break
	1506	+ }
	1507	+
	1508	+ uuid,err := GetTouristUid(rdata.Token)
	1509	+ if err != nil \|\| uuid==0{
	1510	+ logger.Error("HandleQueryPlayerData GetTouristUid failed=%v", err)
	1511	+ resp.Result.Code = ERROR_GETUSERIDFAILED
	1512	+ break
	1513	+ }
	1514	+
	1515	+ finfo := GetFfiendData(rdata.User_id)
	1516	+ if finfo == nil {
	1517	+ logger.Error("HandleQueryPlayerData ERROR_FRIENDGETFRIENDINFOFAILED failed=%v", err)
	1518	+ resp.Result.Code = ERROR_FRIENDGETFRIENDINFOFAILED
	1519	+ break
	1520	+ }
	1521	+
	1522	+ resp.Result.Data.Player_data = *finfo
	1523	+
	1524	+ resp.Result.Code = ERROR_OK
	1525	+ break
	1526	+ }
	1527	+
	1528	+ //回包
	1529	+ respstr, _ := json.Marshal(&resp)
	1530	+ fmt.Fprint(w, string(respstr))
1492	1531	}
1493	1532	\ No newline at end of file
...	...