From 054a41f8eebf385818346f39cf9479ff88efb3f2 Mon Sep 17 00:00:00 2001
From: 陆恒 <luheng@puchigames.com>
Date: Fri, 17 Jul 2020 10:51:21 +0800
Subject: [PATCH] 提交

---
 src/HttpServer/logic/datadef.go    | 14 ++++++++++++++
 src/HttpServer/logic/httpserver.go | 22 ++++++++++++++++++++++
 src/HttpServer/logic/logic.go      | 37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+), 0 deletions(-)

diff --git a/src/HttpServer/logic/datadef.go b/src/HttpServer/logic/datadef.go
index 1df517d..dd5eb90 100644
--- a/src/HttpServer/logic/datadef.go
+++ b/src/HttpServer/logic/datadef.go
@@ -79,6 +79,19 @@ type GetcashrecordResp struct {
 	Data    WithDrawList `json:"data"`
 }
 
+
+
+type UploadlevelReq struct {
+	Level  int `json:"level"`
+	Gameid  string `json:"gameid"`
+	Channel string `json:"channel"`
+}
+
+type UploadlevelResp struct {
+	Code    int          `json:"code"`
+	Message string       `json:"message"`
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////
 
 type GetCashListResp struct {
@@ -146,6 +159,7 @@ type UserData struct {
 	LeftFreeRB       int          //剩余免费红包次数
 	UpLvCostTime     int          //上一个等级升级时间
 	UpLvCostTimeSec  int          //上一个等级升级的时间点时刻
+	PassLevel		int			//当前关卡
 	ReadNum          int          //玩家微转发阅读量
 	GetCashCnt       int          //当天提现次数
 	WithDraw         WithDrawInfo //提现记录信息
diff --git a/src/HttpServer/logic/httpserver.go b/src/HttpServer/logic/httpserver.go
index 22f7cab..7522be7 100644
--- a/src/HttpServer/logic/httpserver.go
+++ b/src/HttpServer/logic/httpserver.go
@@ -41,6 +41,7 @@ func startServerHttpServe() {
 	http.HandleFunc("/brainhole/querygetcashinfo", Querdrawinfo)                 //获取提现档位信息接口
 	http.HandleFunc("/brainhole/getcash", Getcash)                           //提现
 	http.HandleFunc("/brainhole/getcashrecord", Getcashrecord)               //提现记录列表
+	http.HandleFunc("/brainhole/uploadlevel", Uploadlevel)               //上报当前关卡
 
 
 	err := http.ListenAndServe(conf.GetServerHttpAddrConf(), nil)
@@ -90,6 +91,27 @@ func Getcash(w http.ResponseWriter, r *http.Request) {
 	HandlerGetcash(w, s, Uuid)
 }
 
+func Uploadlevel(w http.ResponseWriter, r *http.Request) {
+
+	Uuid := 0
+	if len(r.Header) > 0 {
+		Uuid, _ = strconv.Atoi(r.Header.Get("Uuid"))
+	}
+
+	if Uuid == 0 {
+		SetHeader(w)
+		//logger.Error("Uuid is nil!")
+		return
+	}
+	result, _ := ioutil.ReadAll(r.Body)
+	r.Body.Close()
+
+	s := string(result)
+	logger.Info("Uploadlevel , body:%v,uuid=%v", s, Uuid)
+
+	HandlerUploadlevel(w, s, Uuid)
+}
+
 func Getcashrecord(w http.ResponseWriter, r *http.Request) {
 
 	Uuid := 0
diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go
index 5ed503f..1e1b714 100644
--- a/src/HttpServer/logic/logic.go
+++ b/src/HttpServer/logic/logic.go
@@ -192,6 +192,43 @@ func HandlerGetcash(w http.ResponseWriter, data string, uuid int) {
 
 }
 
+func HandlerUploadlevel(w http.ResponseWriter, data string, uuid int) {
+	SetHeader(w)
+	var resp UploadlevelResp
+	resp.Code = 0
+	var rdata UploadlevelReq
+	err := json.Unmarshal([]byte(data), &rdata)
+	for {
+		if err != nil {
+			logger.Info("json decode HandlerUploadlevel data failed:%v,for:%v", err, data)
+			resp.Message = "json解析错误"
+			resp.Code = 1
+			break
+		}
+
+		uniqueuuid := strconv.Itoa(uuid) + rdata.Channel
+		uinfo, err := GetUserInfo(uniqueuuid)
+		if err != nil || uinfo == nil {
+			logger.Error("redis failed err=%v", err)
+			resp.Message = "服务器错误"
+			resp.Code = 1
+			break
+		}
+
+		uinfo.PassLevel = rdata.Level
+
+		SaveUserInfo(uinfo,uniqueuuid)
+
+		resp.Code = 0
+		break
+	}
+
+	//回包
+	respstr, _ := json.Marshal(&resp)
+	fmt.Fprint(w, string(respstr))
+
+}
+
 func HandlerGetcashrecord(w http.ResponseWriter, data string, uuid int) {
 	SetHeader(w)
 	var resp GetcashrecordResp
--
libgit2 0.21.0