金币新增返回 extralimit字段

李旭
1 parent c69654bb
Showing 3 changed files with 39 additions and 30 deletions Show diff stats
src/HttpServer/logic/datadef.go
src/HttpServer/logic/function.go
src/HttpServer/logic/logic.go
@@ -11,10 +11,11 @@ type AddcointotoutiaoReq struct {
 }
 type AddcointotoutiaoResp struct {
-	Errcode   int    `json:"errcode"`
-	Errmsg    string `json:"errmsg"`
-	Data      int    `json:"data"`
-	Extra_ADD int    `json:"gold_coin_extra_add"`
+	Errcode     int    `json:"errcode"`
+	Errmsg      string `json:"errmsg"`
+	Data        int    `json:"data"`
+	Extra_ADD   int    `json:"gold_coin_extra_add"`
+	Extra_Limit bool    `json:"gold_coin_extra_limit"`
 }
 type GetAccessTokenResp struct {
@@ -64,12 +65,13 @@ type FetchproteryboxReq struct {
 }
 type FetchproteryboxData struct {
-	Goldnum   int   `json:"goldnum"`
-	Sumgold   int   `json:"sumgold"`
-	Curlevle  int64 `json:"curlevle"`
-	Leftcnt   int   `json:"leftcnt"`
-	Curpoerty int64 `json:"curpoerty"`
-	ExtraGold int   `json:"extragold"`
+	Goldnum    int   `json:"goldnum"`
+	Sumgold    int   `json:"sumgold"`
+	Curlevle   int64 `json:"curlevle"`
+	Leftcnt    int   `json:"leftcnt"`
+	Curpoerty  int64 `json:"curpoerty"`
+	ExtraGold  int   `json:"extragold"`
+	ExtraLimit bool  `json:"extralimit"`
 }
 type FetchproteryboxResp struct {
@@ -101,9 +103,10 @@ type AddgoldReq struct {
 }
 type AddgoldData struct {
-	Taoalgoldnum int `json:"taoalgoldnum"`
-	Rewardgold   int `json:"rewardgold"`
-	ExtraGold    int `json:"extragold"`
+	Taoalgoldnum int  `json:"taoalgoldnum"`
+	Rewardgold   int  `json:"rewardgold"`
+	ExtraGold    int  `json:"extragold"`
+	ExtraLimit   bool `json:"extralimit"`
 }
 type AddgoldResp struct {
@@ -134,11 +137,12 @@ type DosignReq struct {
 }
 type DosignData struct {
-	Curround     int `json:"curround"`
-	Curday       int `json:"curday"`
-	Issigntaday  int `json:"issigntaday"`
-	Taoalgoldnum int `json:"taoalgoldnum"`
-	ExtraGold    int `json:"extragold"`
+	Curround     int  `json:"curround"`
+	Curday       int  `json:"curday"`
+	Issigntaday  int  `json:"issigntaday"`
+	Taoalgoldnum int  `json:"taoalgoldnum"`
+	ExtraGold    int  `json:"extragold"`
+	ExtraLimit   bool `json:"extralimit"`
 }
 type DosignResp struct {
@@ -273,21 +273,22 @@ func GetCoinFromToutiao(openid string, deviceid int) (int, error) {
 	return tmp.Data, nil
 }
-func AddCoinToTouTiao(openid string, deviceid, amount int, descr string, btype string) (int, int, int, error) {
+func AddCoinToTouTiao(openid string, deviceid, amount int, descr string, btype string) (int, int, int, bool, error) {
 	gold_coin_extra_add := 0
+	gold_coin_extra_limit := false
 	acctoken, err := GetAccessToken()
 	if err != nil {
 		logger.Error("AddCoinToTouTiao err=%v", err)
-		return 0, 0, gold_coin_extra_add, err
+		return 0, 0, gold_coin_extra_add, gold_coin_extra_limit, err
 	}
 	//获取		GlobalID
 	globalid, err := GetBytedanceGlobalID(acctoken, openid)
 	if err != nil {
 		logger.Error("AddCoinToTouTiao GetBytedanceGlobalID err=%v", err)
-		return 0, 0, gold_coin_extra_add, err
+		return 0, 0, gold_coin_extra_add, gold_coin_extra_limit, err
 	}
 	var reqdata AddcointotoutiaoReq
@@ -302,7 +303,7 @@ func AddCoinToTouTiao(openid string, deviceid, amount int, descr string, btype s
 	bys, err := json.Marshal(&reqdata)
 	if err != nil {
 		logger.Error("AddCoinToTouTiao failed=%v", err)
-		return 0, 0, gold_coin_extra_add, err
+		return 0, 0, gold_coin_extra_add, gold_coin_extra_limit, err
 	}
 	//计算签名
@@ -313,30 +314,31 @@ func AddCoinToTouTiao(openid string, deviceid, amount int, descr string, btype s
 	res, err := BeegoHttpPost(apiurl, reqdata)
 	if err != nil {
 		logger.Error("AddCoinToTouTiao failed=%v", err)
-		return 0, 0, gold_coin_extra_add, err
+		return 0, 0, gold_coin_extra_add, gold_coin_extra_limit, err
 	}
 	var resp AddcointotoutiaoResp
 	err = json.Unmarshal([]byte(res), &resp)
 	if err != nil {
 		logger.Error("AddCoinToTouTiao failed=%v", err)
-		return 0, 0, gold_coin_extra_add, err
+		return 0, 0, gold_coin_extra_add, gold_coin_extra_limit, err
 	}
 	if resp.Errcode != 0 {
 		logger.Error("AddCoinToTouTiao failed=%v", resp)
-		return 0, 0, gold_coin_extra_add, errors.New(resp.Errmsg)
+		return 0, 0, gold_coin_extra_add, gold_coin_extra_limit, errors.New(resp.Errmsg)
 	}
 	newcoin, err := GetCoinFromToutiao(openid, 1)
 	if err != nil {
 		logger.Error("AddCoinToTouTiao failed=%v", err)
-		return 0, 0, gold_coin_extra_add, err
+		return 0, 0, gold_coin_extra_add, gold_coin_extra_limit, err
 	}
 	gold_coin_extra_add = resp.Extra_ADD
+	gold_coin_extra_limit = resp.Extra_Limit
-	return resp.Data, newcoin, gold_coin_extra_add, nil
+	return resp.Data, newcoin, gold_coin_extra_add, gold_coin_extra_limit, nil
 }
 func BeegoHttpPost(url string, reqdata AddcointotoutiaoReq) (string, error) {
@@ -250,7 +250,7 @@ func HandlerDosign(w http.ResponseWriter, data string) {
 		}
 		//加金币
-		_, sumgold, extragold, err := AddCoinToTouTiao(rdata.Openid, 1, cfg.Reward, "签到奖励", "other")
+		_, sumgold, extragold, extralimit, err := AddCoinToTouTiao(rdata.Openid, 1, cfg.Reward, "签到奖励", "other")
 		if err != nil {
 			logger.Info(" HandlerAddgold AddCoinToTouTiao failed:%v,for:%v", err, data)
 			resp.RetMsg = "调用头条接口失败"
@@ -263,6 +263,7 @@ func HandlerDosign(w http.ResponseWriter, data string) {
 		resp.RetData.Curday = uinfo.SingDay
 		resp.RetData.Taoalgoldnum = sumgold
 		resp.RetData.ExtraGold = extragold
+		resp.RetData.ExtraLimit = extralimit
 		break
 	}
@@ -343,7 +344,7 @@ func HandlerAddgold(w http.ResponseWriter, data string) {
 			break
 		}
-		addnum, sumnum, extragold, err := AddCoinToTouTiao(rdata.Openid, 1, rdata.Gold_num, "闯关送金币", "other")
+		addnum, sumnum, extragold, extralimit, err := AddCoinToTouTiao(rdata.Openid, 1, rdata.Gold_num, "闯关送金币", "other")
 		if err != nil {
 			logger.Info(" HandlerAddgold property failed:%v,for:%v", err, data)
 			resp.RetMsg = "调用头条接口失败"
@@ -355,6 +356,7 @@ func HandlerAddgold(w http.ResponseWriter, data string) {
 		resp.RetData.Taoalgoldnum = sumnum
 		resp.RetData.Rewardgold = rdata.Gold_num
 		resp.RetData.ExtraGold = extragold
+		resp.RetData.ExtraLimit = extralimit
 		//保存
 		err = SaveUserInfo(uinfo)
 		if err != nil {
@@ -477,7 +479,7 @@ func HandlerFetchproterybox(w http.ResponseWriter, data string) {
 		}
 		//加金币
-		addgold, sumgold, extragold, err := AddCoinToTouTiao(rdata.Openid, 1, cfg.Reward, "每日领取宝箱奖励", "other")
+		addgold, sumgold, extragold, extralimit, err := AddCoinToTouTiao(rdata.Openid, 1, cfg.Reward, "每日领取宝箱奖励", "other")
 		if err != nil {
 			logger.Info(" HandlerFetchproterybox property failed:%v,for:%v", err, data)
 			resp.RetMsg = "调用头条接口失败"
@@ -496,6 +498,7 @@ func HandlerFetchproterybox(w http.ResponseWriter, data string) {
 		//resp.RetData.Leftcnt = Decrcurrency(currkey, rdata.Openid)
 		resp.RetData.Curpoerty = uinfo.Property
 		resp.RetData.ExtraGold = extragold
+		resp.RetData.ExtraLimit = extralimit
 		//保存
 		err = SaveUserInfo(uinfo)