pull/9/head
mofangmin 1 year ago
parent ff70f832eb
commit f06d4b1c28
  1. 4
      call/user.go
  2. 3
      modules/backend/handler/common/common.go
  3. 19
      modules/web/handler/activity.go

@ -616,6 +616,10 @@ func UpdatePlayerProfile(data *common.ESGameData) error {
func GetPlayerData(uid int) *common.PlayerData { func GetPlayerData(uid int) *common.PlayerData {
data := &common.PlayerData{UID: uid} data := &common.PlayerData{UID: uid}
db.Mysql().Get(data) db.Mysql().Get(data)
now := time.Now()
if !util.IsSameDayTimeStamp(now.Unix(), data.DayBetTime) {
data.DayBetTime = 0
}
return data return data
} }

@ -92,7 +92,6 @@ func UploadOSS(c *gin.Context) {
}() }()
ossConf := config.GetConfig().Backend.Oss ossConf := config.GetConfig().Backend.Oss
req := new(values.UploadOSSReq) req := new(values.UploadOSSReq)
req.ObjectName = c.PostForm("ObjectName")
req.Folder = c.PostForm("folder") req.Folder = c.PostForm("folder")
if req.Folder != "" && !strings.HasSuffix(req.Folder, "/") { if req.Folder != "" && !strings.HasSuffix(req.Folder, "/") {
req.Folder += "/" req.Folder += "/"
@ -132,5 +131,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/%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)
} }

@ -704,7 +704,6 @@ func ActivityLuckyCodeDraw(c *gin.Context) {
if !a.CheckActivityExpire(common.ActivityIDLuckyCode) { if !a.CheckActivityExpire(common.ActivityIDLuckyCode) {
return return
} }
req := new(values.ActivityLuckyCodeDrawReq) req := new(values.ActivityLuckyCodeDrawReq)
if !a.S(req) { if !a.S(req) {
return return
@ -733,7 +732,8 @@ func ActivityLuckyCodeDraw(c *gin.Context) {
total := call.GetConfigAcitivityLuckyCodeTotalWeight(codeType) total := call.GetConfigAcitivityLuckyCodeTotalWeight(codeType)
if total == 0 { if total == 0 {
log.Error("con:%+v invalid,uid:%d", con, a.UID) log.Error("con:%+v invalid,uid:%d", con, a.UID)
a.Code = values.CodeRetry a.Code = values.CodeParam
a.Msg = "रतरण कड ति"
return return
} }
if data.ID == 0 { if data.ID == 0 {
@ -788,6 +788,7 @@ func ActivityLuckyCodeDraw(c *gin.Context) {
if err != nil { if err != nil {
log.Error("err:%v", err) log.Error("err:%v", err)
a.Code = values.CodeRetry a.Code = values.CodeRetry
a.Msg = "रतरण कड ति"
return return
} }
call.UploadActivityData(a.UID, common.ActivityIDLuckyCode, common.ActivityDataJoin, reward) call.UploadActivityData(a.UID, common.ActivityIDLuckyCode, common.ActivityDataJoin, reward)
@ -1022,6 +1023,15 @@ func GetSignNewInfo(uid int) (resp *values.ActivitySignInfoResp) {
resp.Sign = 7*(data.Wheel-1) + signDay resp.Sign = 7*(data.Wheel-1) + signDay
resp.Day = signDay + 1 resp.Day = signDay + 1
now := time.Now() now := time.Now()
if data.Finish || util.IsSameDayTimeStamp(now.Unix(), data.SignTime) {
for _, v := range resp.List {
if v.Day == signDay && data.Wheel >= v.WheelStart && data.Wheel <= v.WheelEnd {
resp.Recharge = v.Recharge
resp.Bet = v.Bet
break
}
}
}
if util.IsSameDayTimeStamp(now.Unix(), data.SignTime) { if util.IsSameDayTimeStamp(now.Unix(), data.SignTime) {
return return
} }
@ -1125,7 +1135,10 @@ func ActivitySignNewDraw(c *gin.Context) {
// ok // ok
newSign := Sign(day) newSign := Sign(day)
updates := map[string]interface{}{"sign": newSign, "finish": false, "reward": gorm.Expr("reward + ?", reward), "sign_time": now.Unix()} updates := map[string]interface{}{"sign": newSign, "finish": false, "reward": gorm.Expr("reward + ?", reward)}
if config.GetBase().Release {
updates["sign_time"] = now.Unix()
}
rows, err := db.Mysql().UpdateRes(&common.ActivitySignData{UID: a.UID, Sign: data.Sign}, updates) rows, err := db.Mysql().UpdateRes(&common.ActivitySignData{UID: a.UID, Sign: data.Sign}, updates)
if rows == 0 || err != nil { if rows == 0 || err != nil {
log.Error("err:%v", err) log.Error("err:%v", err)

Loading…
Cancel
Save