diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go index 7573f24..f4d7f4b 100644 --- a/src/HttpServer/logic/function.go +++ b/src/HttpServer/logic/function.go @@ -492,8 +492,8 @@ func (u *UserData) HandlePassDay() { logger.Info("HandlePassDay lasttime=%v,lasttimestamp=%v", lasttime, lasttimestamp) logger.Info("HandlePassDay2 IsResetToday=%v,nowtimestampmin=%v", u.IsResetToday, nowtime.Minute()) - //if u.IsResetToday == 0 && nowtimestamp.Hour() >= 12 { - if u.IsResetToday == 0 && nowtime.Minute() >= 27 { + if u.IsResetToday == 0 && nowtimestamp.Hour() >= 12 { + //if u.IsResetToday == 0 && nowtime.Minute() >= 27 { u.DoubleLeftTimes = ACCGOLDRATELIMIT u.GetWatchAdsGoldTime = WATCHADSGOLDLIMIT u.DrawTicket = DRAWTICKETNUM diff --git a/src/HttpServer/logic/httpserver.go b/src/HttpServer/logic/httpserver.go index 9aebaea..4836b85 100644 --- a/src/HttpServer/logic/httpserver.go +++ b/src/HttpServer/logic/httpserver.go @@ -23,101 +23,101 @@ var G_randVal = float32(rand.Intn(100))/100 + 180 func StartHttpTicker() { ticker := time.NewTicker(time.Second * time.Duration(30)) - go func() { - for range ticker.C { - if time.Now().Hour() == 0 && time.Now().Minute() < 1 { - rand.Seed(time.Now().UnixNano()) - randint := rand.Intn(100) - floatval := float32(randint) / 100 - G_randVal = 180 + floatval - } - if time.Now().Hour() == 12 && time.Now().Minute() < 5 { - //处理开奖 - logger.Info("Handle kaijian") - waits := GetWaitCaiCatList() - if waits != nil { - for k, val := range waits { - if val.FakeNum != 0 { - waits[k].RewardUser = 0 - waits[k].RewardNum = val.FakeNum - for _, vval := range val.List { - uinfo, err := GetUserInfo(strconv.Itoa(vval.UserId)) - if err != nil || uinfo == nil { - continue - } + for range ticker.C { + logger.Info("StartHttpTicker ticker") + if time.Now().Hour() == 0 && time.Now().Minute() < 1 { + rand.Seed(time.Now().UnixNano()) + randint := rand.Intn(100) + floatval := float32(randint) / 100 + G_randVal = 180 + floatval + } + if time.Now().Hour() == 12 && time.Now().Minute() < 5 { + //处理开奖 + logger.Info("Handle kaijian") + waits := GetWaitCaiCatList() + if waits != nil { + for k, val := range waits { + if val.FakeNum != 0 { + waits[k].RewardUser = 0 + waits[k].RewardNum = val.FakeNum + for _, vval := range val.List { + uinfo, err := GetUserInfo(strconv.Itoa(vval.UserId)) + if err != nil || uinfo == nil { + continue + } - var tmp UserCaiPiaoHistory - tmp.RewardNum = waits[k].RewardNum - cid := strconv.Itoa(waits[k].CurRound) + strconv.Itoa(vval.ChooseNum) - tmp.CatId, _ = strconv.Atoi(cid) - tmp.Round = waits[k].CurRound - tmp.Cnum = vval.ChooseNum - uinfo.CaiPiaoInfo = append(uinfo.CaiPiaoInfo, tmp) + var tmp UserCaiPiaoHistory + tmp.RewardNum = waits[k].RewardNum + cid := strconv.Itoa(waits[k].CurRound) + strconv.Itoa(vval.ChooseNum) + tmp.CatId, _ = strconv.Atoi(cid) + tmp.Round = waits[k].CurRound + tmp.Cnum = vval.ChooseNum + uinfo.CaiPiaoInfo = append(uinfo.CaiPiaoInfo, tmp) - SaveUserInfo(uinfo, strconv.Itoa(vval.UserId)) + SaveUserInfo(uinfo, strconv.Itoa(vval.UserId)) + } + } else { + //否则从奖池里面选一个 + randnum := rand.Intn(len(val.List)) + waits[k].RewardNum = val.List[randnum].ChooseNum + waits[k].RewardUser = val.List[randnum].UserId + for _, vval := range val.List { + uinfo, err := GetUserInfo(strconv.Itoa(vval.UserId)) + if err != nil || uinfo == nil { + continue } - } else { - //否则从奖池里面选一个 - randnum := rand.Intn(len(val.List)) - waits[k].RewardNum = val.List[randnum].ChooseNum - waits[k].RewardUser = val.List[randnum].UserId - for _, vval := range val.List { - uinfo, err := GetUserInfo(strconv.Itoa(vval.UserId)) - if err != nil || uinfo == nil { - continue - } - if vval.UserId == waits[k].RewardUser { - logger.Info("StartHttpTicker addtouser =%v", vval.UserId) - //给这个玩家发奖 - cfg := jsonconf.GetRedCatConfig(48) - if cfg != nil { - - uinfo.AddRedPackect(cfg.Money, 100) - } + if vval.UserId == waits[k].RewardUser { + logger.Info("StartHttpTicker addtouser =%v", vval.UserId) + //给这个玩家发奖 + cfg := jsonconf.GetRedCatConfig(48) + if cfg != nil { + uinfo.AddRedPackect(cfg.Money, 100) } - var tmp UserCaiPiaoHistory - tmp.RewardNum = waits[k].RewardNum - cid := strconv.Itoa(waits[k].CurRound) + strconv.Itoa(vval.ChooseNum) - tmp.CatId, _ = strconv.Atoi(cid) - tmp.Round = waits[k].CurRound - tmp.Cnum = vval.ChooseNum - uinfo.CaiPiaoInfo = append(uinfo.CaiPiaoInfo, tmp) - - SaveUserInfo(uinfo, strconv.Itoa(vval.UserId)) } + var tmp UserCaiPiaoHistory + tmp.RewardNum = waits[k].RewardNum + cid := strconv.Itoa(waits[k].CurRound) + strconv.Itoa(vval.ChooseNum) + tmp.CatId, _ = strconv.Atoi(cid) + tmp.Round = waits[k].CurRound + tmp.Cnum = vval.ChooseNum + uinfo.CaiPiaoInfo = append(uinfo.CaiPiaoInfo, tmp) - } - } + SaveUserInfo(uinfo, strconv.Itoa(vval.UserId)) - //然后将开奖记录写入已开奖 - //将已开奖加入列表 - - for _, val := range waits { - var tmp AlreadyDuboCatList - tmp.CurRound = val.CurRound - tmp.RewardNum = val.RewardNum - tmp.List = append(tmp.List, val.List...) - tmp.RewardUser = val.RewardUser - tmp.TimeStr = int(time.Now().Unix()) - savestr, err := json.Marshal(&tmp) - if err == nil { - redishandler.GetRedisClient().HSet(redis.CAIPIAOKAIJIANGHISTORY_KEY, strconv.Itoa(tmp.CurRound), string(savestr)) } } + } - //最后清空待开奖类别 - redishandler.GetRedisClient().Delete(redis.CAIPIAOKAIJIANGWAIT_KEY) + //然后将开奖记录写入已开奖 + //将已开奖加入列表 + + for _, val := range waits { + var tmp AlreadyDuboCatList + tmp.CurRound = val.CurRound + tmp.RewardNum = val.RewardNum + tmp.List = append(tmp.List, val.List...) + tmp.RewardUser = val.RewardUser + tmp.TimeStr = int(time.Now().Unix()) + savestr, err := json.Marshal(&tmp) + if err == nil { + redishandler.GetRedisClient().HSet(redis.CAIPIAOKAIJIANGHISTORY_KEY, strconv.Itoa(tmp.CurRound), string(savestr)) + } } + //最后清空待开奖类别 + redishandler.GetRedisClient().Delete(redis.CAIPIAOKAIJIANGWAIT_KEY) + } - time.Sleep(time.Second * 20) + } - }() + time.Sleep(time.Second * 20) + } + } func StartHttpServe() { -- libgit2 0.21.0