From 296664f203e8aa0efd3d7bd96ccd868fc216a60c Mon Sep 17 00:00:00 2001
From: 陆恒 <luheng@puchigames.com>
Date: Wed, 17 Jun 2020 14:56:52 +0800
Subject: [PATCH] 提交

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

diff --git a/src/HttpServer/logic/datadef.go b/src/HttpServer/logic/datadef.go
index 96c9681..a29ac89 100644
--- a/src/HttpServer/logic/datadef.go
+++ b/src/HttpServer/logic/datadef.go
@@ -45,6 +45,20 @@ type AddFlopResp struct {
 	Message string      `json:"message"`
 }
 
+type SettlementReq struct {
+	Round     int `json:"round"`
+	RewardNum int `json:"rewardNum"`
+}
+
+type SettlementData struct {
+}
+
+type SettlementResp struct {
+	Code    int            `json:"code"`
+	Data    SettlementData `json:"data"`
+	Message string         `json:"message"`
+}
+
 type ChangeCoinData struct {
 	Coin DoBuyCatCoin `json:"coin"`
 }
diff --git a/src/HttpServer/logic/httpserver.go b/src/HttpServer/logic/httpserver.go
index 39a512e..e190fce 100644
--- a/src/HttpServer/logic/httpserver.go
+++ b/src/HttpServer/logic/httpserver.go
@@ -114,6 +114,7 @@ func startServerHttpServe() {
 	http.HandleFunc("/api/test/changeCoin", ChangeCoin) //增加猫
 	http.HandleFunc("/api/test/addAdCount", AddAdCount) //增加广告次数
 	http.HandleFunc("/api/test/addFlop", AddFlop)       //增加翻牌
+	http.HandleFunc("/api/test/settlement", Settlement) //发财猫开奖
 
 	//real
 	http.HandleFunc("/api/account/login", UserLogin)                        //登录
@@ -1295,6 +1296,24 @@ func Getrandredbag(w http.ResponseWriter, r *http.Request) {
 	HandlerGetrandredbag(w, s, Uuid)
 }
 
+func Settlement(w http.ResponseWriter, r *http.Request) {
+	Uuid := 0
+	if len(r.Header) > 0 {
+		Uuid, _ = strconv.Atoi(r.Header.Get("uid"))
+	}
+	if Uuid == 0 {
+		SetHeader(w)
+		return
+	}
+	result, _ := ioutil.ReadAll(r.Body)
+	r.Body.Close()
+
+	s := string(result)
+	logger.Info("Settlement , body:%v,uuid=%v", s, Uuid)
+
+	HandlerSettlement(w, s, Uuid)
+}
+
 func AddFlop(w http.ResponseWriter, r *http.Request) {
 	Uuid := 0
 	if len(r.Header) > 0 {
diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go
index 91e7a4b..545e75f 100644
--- a/src/HttpServer/logic/logic.go
+++ b/src/HttpServer/logic/logic.go
@@ -41,6 +41,43 @@ func SetHeader(w http.ResponseWriter) {
 
 }
 
+func HandlerSettlement(w http.ResponseWriter, data string, uuid int) {
+	SetHeader(w)
+	var resp SettlementResp
+	resp.Code = 0
+	resp.Message = "success"
+	var rdata SettlementReq
+	err := json.Unmarshal([]byte(data), &rdata)
+	if err != nil {
+		logger.Info("json decode HandlerSettlement data failed:%v,for:%v", err, data)
+		resp.Message = "json unmarshal failed"
+		resp.Code = 1
+		respstr, _ := json.Marshal(&resp)
+		logger.Info("###HandlerLogin###rdata:%v", string(respstr))
+		fmt.Fprint(w, string(respstr))
+		return
+	}
+
+	for {
+
+		uinfo, err := GetUserInfo(strconv.Itoa(uuid))
+		if err != nil || uinfo == nil {
+			logger.Error("HandlerTestaddCat getuserinfo failed=%v", err)
+			resp.Code = 1
+			resp.Message = "get userinfo failed"
+			break
+		}
+
+		SaveUserInfo(uinfo, strconv.Itoa(uuid))
+		break
+	}
+
+	//回包
+	respstr, _ := json.Marshal(&resp)
+	fmt.Fprint(w, string(respstr))
+
+}
+
 func HandlerAddFlop(w http.ResponseWriter, data string, uuid int) {
 	SetHeader(w)
 	var resp AddFlopResp
--
libgit2 0.21.0