转盘活动

pull/9/head
mofangmin 1 year ago
parent a0743f2480
commit 76294d4762
  1. 2
      call/task.go
  2. 1
      common/task.go
  3. 2
      modules/backend/handler/common/common.go
  4. 1
      modules/web/app/account.go
  5. 4
      modules/web/handler/account.go
  6. 6
      modules/web/handler/activity.go
  7. 8
      modules/web/handler/firstpage.go
  8. 1
      modules/web/handler/h5.go
  9. 2
      modules/web/middleware/token.go
  10. 4
      modules/web/routers/routers_activity.go

@ -22,7 +22,7 @@ func CheckTask(task Task) {
uid := task.Uid uid := task.Uid
for _, v := range con { for _, v := range con {
for _, t := range task.Types { for _, t := range task.Types {
if (t == common.TaskTypeOnceRecharge || t == common.TaskTypeInvite) && v.Type == t { // 单次充值任务 || 首次充值任务 || v.Type == common.TaskTypeFirstRecharge) if (t == common.TaskTypeOnceRecharge || t == common.TaskTypeInvite || t == common.TaskTypeDownload) && v.Type == t { // 单次充值任务 || 首次充值任务 || v.Type == common.TaskTypeFirstRecharge)
data := GetUserTaskDataByTaskID(task.Uid, v.TaskID) data := GetUserTaskDataByTaskID(task.Uid, v.TaskID)
if data.ID == 0 { if data.ID == 0 {
db.Mysql().Create(&common.TaskData{UID: uid, TaskID: v.TaskID, Time: now, Progress: v.Target}) db.Mysql().Create(&common.TaskData{UID: uid, TaskID: v.TaskID, Time: now, Progress: v.Target})

@ -9,6 +9,7 @@ const (
TaskTypePlayGame // 参与一次牌局 TaskTypePlayGame // 参与一次牌局
TaskTypeBet1000 // 累计下注1000 TaskTypeBet1000 // 累计下注1000
TaskTypeBet10000 // 累计下注10000 TaskTypeBet10000 // 累计下注10000
TaskTypeDownload // app下载
TaskTypeAll TaskTypeAll
) )

@ -132,5 +132,5 @@ func UploadOSS(c *gin.Context) {
log.Error("UploadOSS PutObject err:%v", err) log.Error("UploadOSS PutObject err:%v", err)
return return
} }
rsp.Url = fmt.Sprintf("https://%s/%s", ossConf.Domain, ossConf.ObjectName+req.Folder+file.Filename) rsp.Url = fmt.Sprintf("https://%s/%s/%s%s", ossConf.Domain, ossConf.ObjectName, req.Folder, file.Filename)
} }

@ -82,6 +82,7 @@ func (g *Gin) QueryUser(req values.CommonLogin) (user *common.PlayerDBInfo, isNe
g.Code = values.CodeRetry g.Code = values.CodeRetry
if err.Error() == "ip" { if err.Error() == "ip" {
g.Code = values.CodeAccountIPLimit g.Code = values.CodeAccountIPLimit
g.Msg = "ip limit"
} }
return return
} }

@ -44,7 +44,11 @@ func onLogin(user *common.PlayerDBInfo, a *app.Gin, isNew bool) {
} }
// log.Debug("scheme:%v", a.Context.GetHeader("X-Forwarded-Proto")) // log.Debug("scheme:%v", a.Context.GetHeader("X-Forwarded-Proto"))
// if a.Context.Request.URL.Scheme == "https" { // if a.Context.Request.URL.Scheme == "https" {
if config.GetBase().Release {
gateURL = "wss://" + gateURL gateURL = "wss://" + gateURL
} else {
gateURL = "wss://" + gateURL + ":26615"
}
// } else { // } else {
// gateURL = "ws://" + gateURL // gateURL = "ws://" + gateURL
// } // }

@ -1096,7 +1096,7 @@ func ActivitySignNewDraw(c *gin.Context) {
if util.IsSameDayTimeStamp(now.Unix(), data.SignTime) { if util.IsSameDayTimeStamp(now.Unix(), data.SignTime) {
// 已经签到 // 已经签到
a.Code = values.CodeParam a.Code = values.CodeParam
a.Msg = "Check-in repetido." a.Msg = "आज म हसषर कि"
return return
} }
@ -1174,7 +1174,6 @@ func ActivityBreakGiftInfo(c *gin.Context) {
if call.GetUserCurrency(a.UID, common.CurrencyINR) > limit { if call.GetUserCurrency(a.UID, common.CurrencyINR) > limit {
return return
} }
payData := call.GetPlayerPayData(a.UID) payData := call.GetPlayerPayData(a.UID)
re := call.GetRechargeInfo(a.UID) re := call.GetRechargeInfo(a.UID)
con := call.GetConfigActivityBreakGiftByRecharge(re.TotalRecharge, payData) con := call.GetConfigActivityBreakGiftByRecharge(re.TotalRecharge, payData)
@ -1182,7 +1181,6 @@ func ActivityBreakGiftInfo(c *gin.Context) {
if con == nil { if con == nil {
return return
} }
if util.SliceContain(payData.SubBreakGift, con.Level) { if util.SliceContain(payData.SubBreakGift, con.Level) {
return return
} }
@ -1759,10 +1757,12 @@ func ActivityBetDrawInfo(c *gin.Context) {
} }
a.GetUID() a.GetUID()
drawInfo := &common.ActivityBetDrawData{UID: a.UID} drawInfo := &common.ActivityBetDrawData{UID: a.UID}
if a.UID > 0 {
db.Mysql().Get(drawInfo) db.Mysql().Get(drawInfo)
if drawInfo.ID == 0 { if drawInfo.ID == 0 {
db.Mysql().Create(drawInfo) db.Mysql().Create(drawInfo)
} }
}
a.Data = &values.ActivityBetDrawInfoResp{ a.Data = &values.ActivityBetDrawInfoResp{
List: call.GetConfigBetDraw(), List: call.GetConfigBetDraw(),
Lucky: drawInfo.Lucky, Lucky: drawInfo.Lucky,

@ -97,10 +97,10 @@ func FirstPage(c *gin.Context) {
if len(list) > 0 { if len(list) > 0 {
resp.Esport = list[0] resp.Esport = list[0]
} }
// task := call.GetConfigTaskByTaskType(common.TaskTypeDownload) task := call.GetConfigTaskByTaskType(int(common.TaskTypeDownload))
// if len(task) > 0 { if len(task) > 0 {
// resp.DownloadAppReward = task[0].Reward resp.DownloadAppReward = task[0].Reward
// } }
resp.ShowData = GetFirstShowData() resp.ShowData = GetFirstShowData()
} }

@ -97,4 +97,5 @@ func H5DownloadDraw(c *gin.Context) {
// Event: common.CurrencyEventH5Download, // Event: common.CurrencyEventH5Download,
// }, // },
// }, true, true) // }, true, true)
call.CheckTask(call.Task{Uid: a.UID, Value: 0, Types: []common.TaskType{common.TaskTypeDownload}})
} }

@ -52,6 +52,8 @@ var (
"/ad/uploadFB": {}, "/ad/uploadFB": {},
"/activity/slots/info": {}, "/activity/slots/info": {},
"/activity/sign/new/info": {}, "/activity/sign/new/info": {},
"/activity/betDraw/info": {},
"/activity/betDraw/record": {},
} }
) )

@ -23,8 +23,8 @@ func activity(e *gin.RouterGroup) {
e.POST("/activity/firstRechargeBack/draw", handler.ActivityFirstRechargeBackDraw) e.POST("/activity/firstRechargeBack/draw", handler.ActivityFirstRechargeBackDraw)
e.POST("/activity/luckyCode/info", handler.ActivityLuckyCodeInfo) e.POST("/activity/luckyCode/info", handler.ActivityLuckyCodeInfo)
e.POST("/activity/luckyCode/draw", handler.ActivityLuckyCodeDraw) e.POST("/activity/luckyCode/draw", handler.ActivityLuckyCodeDraw)
e.POST("/activity/sign/info", handler.ActivitySignInfo) // e.POST("/activity/sign/info", handler.ActivitySignInfo)
e.POST("/activity/sign/draw", handler.ActivitySignDraw) // e.POST("/activity/sign/draw", handler.ActivitySignDraw)
// 新版签到 // 新版签到
e.POST("/activity/sign/new/info", handler.ActivitySignNewInfo) e.POST("/activity/sign/new/info", handler.ActivitySignNewInfo)
e.POST("/activity/sign/new/draw", handler.ActivitySignNewDraw) e.POST("/activity/sign/new/draw", handler.ActivitySignNewDraw)

Loading…
Cancel
Save