From d476d4c0ebb8e204070091c7131c542c0f678fed Mon Sep 17 00:00:00 2001
From: 陆恒 <luheng@puchigames.com>
Date: Thu, 10 Sep 2020 10:27:18 +0800
Subject: [PATCH] 提交一波

---
 src/HttpServer/logic/constdef.go |  2 +-
 src/HttpServer/logic/datadef.go  | 12 +++---------
 src/HttpServer/logic/function.go | 25 ++++++++++++-------------
 3 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/src/HttpServer/logic/constdef.go b/src/HttpServer/logic/constdef.go
index a1aa972..55b1be8 100644
--- a/src/HttpServer/logic/constdef.go
+++ b/src/HttpServer/logic/constdef.go
@@ -29,7 +29,7 @@ const (
 
 //奖励类型枚举
 const (
-	REWARDTYPE_STAR       = 1 //星星
+	REWARDTYPE_STAR       = 1 //金币
 	REWARDTYPE_CHUI       = 2
 	REWARDTYPE_SHUA       = 3
 	REWARDTYPE_SWAP       = 4
diff --git a/src/HttpServer/logic/datadef.go b/src/HttpServer/logic/datadef.go
index 3d5b517..3e46814 100644
--- a/src/HttpServer/logic/datadef.go
+++ b/src/HttpServer/logic/datadef.go
@@ -195,15 +195,9 @@ type GettaskrewardReq struct {
 }
 
 type GettaskrewardData struct {
-	Lv         int `json:"lv"`
-	Costtime   int `json:"costtime"`
-	Rewardstar int `json:"rewardstar"`
-	Chuiitem   int `json:"chuiitem"`
-	Shuaitem   int `json:"shuaitem"`
-	Swapitem   int `json:"swapitem"`
-	Eliminitem int `json:"eliminitem"`
-	Goldnum    int `json:"goldnum"`
-	Addgold    int `json:"addgold"`
+
+	Totalrednum    int `json:"totalrednum"`
+	Getrednum    int `json:"getrednum"`
 }
 type GettaskrewardResp struct {
 	Code    int               `json:"code"`
diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go
index 8cc7899..b63ba37 100644
--- a/src/HttpServer/logic/function.go
+++ b/src/HttpServer/logic/function.go
@@ -442,18 +442,10 @@ func (uinfo *UserData) HandleGetTaskReward(req *GettaskrewardReq, resp *Gettaskr
 	for i := 0; i < sub; i++ {
 		rtype := cfg.Reward[i*2]
 		rnum := cfg.Reward[i*2+1]
-		r1, r2, r3, r4, r5, r6, r7, r8 := uinfo.RewardUser(rtype, rnum, req.Gameid, req.Channel, uuid)
-		if resp.Data.Lv != r1 {
-			resp.Data.Lv = r1
-			resp.Data.Costtime = uinfo.UpLvCostTime / 3600
-		}
-		resp.Data.Rewardstar += r2
-		resp.Data.Chuiitem += r3
-		resp.Data.Shuaitem += r4
-		resp.Data.Swapitem += r5
-		resp.Data.Eliminitem += r6
-		resp.Data.Goldnum = r7
-		resp.Data.Addgold = r8
+		_, _, _, _, _, _, r7, r8 := uinfo.RewardUser(rtype, rnum, req.Gameid, req.Channel, uuid)
+		resp.Data.Getrednum = r8
+		resp.Data.Totalrednum = r7
+		break
 	}
 
 	return nil
@@ -483,7 +475,14 @@ func (uinfo *UserData) RewardUser(rtype int, num int, gameid string, channel str
 	logger.Info("RewardUser rtype=%v,num=%v", rtype, num)
 	switch rtype {
 	case REWARDTYPE_STAR:
-		return 0, num, 0, 0, 0, 0, 0, 0
+		readadd := num / 100
+		goldnum, _, err := AddCoinToSdk(uuid, readadd, gameid, channel, 102)
+		if err != nil {
+			logger.Error("RewardUser failer err=%v", err)
+		}
+		uinfo.RealGold = goldnum
+		return 0, 0, 0, 0, 0, 0, uinfo.RealGold, readadd
+		//uinfo.RealGold += num
 	case REWARDTYPE_CHUI:
 		return 0, 0, num, 0, 0, 0, 0, 0
 	case REWARDTYPE_SHUA:
--
libgit2 0.21.0