|
|
|
@ -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) |
|
|
|
|