diff --git a/src/HttpServer/logic/datadef.go b/src/HttpServer/logic/datadef.go index cde3931..08dda64 100644 --- a/src/HttpServer/logic/datadef.go +++ b/src/HttpServer/logic/datadef.go @@ -44,11 +44,12 @@ type offlineRewardDesc struct { } type GetUserDataData struct { - TimingReward bool `json:"timingReward"` - OfflineReward offlineRewardDesc `json:"offlineReward"` - Output string `json:"output"` - Coin string `json:"coin"` - Now int `json:"now"` + TimingReward bool `json:"timingReward"` + OfflineReward offlineRewardDesc `json:"offlineReward"` + Output string `json:"output"` + Coin string `json:"coin"` + Now int `json:"now"` + TimingRewardTimes int `json:"timingRewardTimes"` } type GetUserDataResp struct { @@ -567,12 +568,12 @@ type adRateData struct { } type GetMainPageInfoData struct { - LimitCatList []int `json:"limitCatList"` - CatList []CatPosInfo `json:"catList"` - Coin DoBuyCatCoin `json:"coin"` - AdRate adRateData `json:"adRate"` - Level int `json:"level"` - TimingRewardTimes int `json:"timingRewardTimes"` + LimitCatList []int `json:"limitCatList"` + CatList []CatPosInfo `json:"catList"` + Coin DoBuyCatCoin `json:"coin"` + AdRate adRateData `json:"adRate"` + Level int `json:"level"` + totalCashReward float32 `json:"totalCashReward"` } type GetMainPageInfoResp struct { diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go index 17ce62b..8410123 100644 --- a/src/HttpServer/logic/logic.go +++ b/src/HttpServer/logic/logic.go @@ -371,6 +371,8 @@ func HandlerGetUserData(w http.ResponseWriter, data string, uuid int) { SaveUserInfo(uinfo, strconv.Itoa(uuid)) } + resp.Data.TimingRewardTimes = uinfo.GetWatchAdsGoldTime + //保存此次计算时间 nowtimestr := strconv.FormatInt(nowtime, 10) redishandler.GetRedisClient().HSet(redis.USER_LAST_CALC_TIME, strconv.Itoa(uuid), nowtimestr) @@ -572,7 +574,7 @@ func HandlerGetMainPageInfo(w http.ResponseWriter, data string, uuid int) { } resp.Data.Level = len(uinfo.BuyCatInfo) - resp.Data.TimingRewardTimes = uinfo.GetWatchAdsGoldTime + resp.Data.totalCashReward = uinfo.TodayZhaocai resp.Code = 0 break } -- libgit2 0.21.0