Compare commits

..

No commits in common. 'eded468450c3428fec42960009f9c094b8bdbc5a' and 'fd8561b5b4fc38088a7f5320376490573c0a6d64' have entirely different histories.

  1. 3
      call/config.go
  2. 3
      call/pay.go
  3. 3
      call/share.go
  4. 41
      call/task.go
  5. 19
      call/user.go
  6. 5
      common/redis_keys.go
  7. 46
      common/task.go
  8. 2
      modules/backend/handler/guser/getGameUserRechargeHistory.go
  9. 143
      modules/web/handler/activity.go
  10. 2
      modules/web/handler/h5.go
  11. 83
      modules/web/handler/task.go
  12. 51
      modules/web/handler/user.go
  13. 1
      modules/web/routers/routers_task.go
  14. 25
      modules/web/values/task.go
  15. 1
      pb/proto/platform.proto

@ -1384,9 +1384,6 @@ func LoadConfigTask() (err error) {
} }
func GetConfigTask() []*common.ConfigTask { func GetConfigTask() []*common.ConfigTask {
if len(configTask) == 0 {
LoadConfigTask()
}
return configTask return configTask
} }

@ -581,7 +581,7 @@ func PayActivity(r *common.RechargeOrder, notCharge bool, user *common.PlayerDBI
// VIP // VIP
UpdateVip(r.UID, r.Amount, 0, 0) UpdateVip(r.UID, r.Amount, 0, 0)
// 检查任务 // 检查任务
CheckTask(Task{r.UID, 1, []common.TaskType{common.TaskTypeRecharge}}) CheckTask(Task{Uid: r.UID, Value: r.Amount, Types: []common.TaskType{common.TaskTypeOnceRecharge}})
// 检查所有活动 // 检查所有活动
CheckAllActivity(r) CheckAllActivity(r)
@ -660,7 +660,6 @@ func CheckAllActivity(r *common.RechargeOrder) {
switch r.ActivityID { switch r.ActivityID {
case common.ActivityIDWeekCard: case common.ActivityIDWeekCard:
ActivityWeekCard(r, product) ActivityWeekCard(r, product)
CheckTask(Task{r.UID, 1, []common.TaskType{common.TaskTypeUnlockWeekCard}})
//case common.ActivityIDBreakGift: //case common.ActivityIDBreakGift:
// ActivityBreakGift(r, product) // ActivityBreakGift(r, product)
//case common.ActivityIDLuckyShop: //case common.ActivityIDLuckyShop:

@ -158,9 +158,6 @@ func ShareBind(share string, isOld bool, uid, cid int) {
log.Error("update share invite task err, %s", err.Error()) log.Error("update share invite task err, %s", err.Error())
return return
} }
// 邀请任务
CheckTask(Task{upInfo.UID, 1, []common.TaskType{common.TaskTypeInviter}})
} }
}) })
} }

@ -11,23 +11,40 @@ import (
type Task struct { type Task struct {
Uid int // uid Uid int // uid
Value int64 // 进度值
Types []common.TaskType // 任务类型 Types []common.TaskType // 任务类型
Value int64 // 进度值
} }
func CheckTask(task Task) (taskId int) { func CheckTask(task Task) (taskId int) {
/*
todo 检查(根据场景进来获取查询任务更新进度)
*/
return
log.Info("checkTask task:%v", task) log.Info("checkTask task:%v", task)
now := time.Now() now := time.Now().Unix()
for _, taskType := range task.Types { con := GetConfigTask()
err := db.Mysql().C().Model(&common.TaskData{}). uid := task.Uid
Where("uid = ? and task_type = ? and task_status = 0 and (end_at >= ? or end_at = -1)", task.Uid, taskType, now.Unix()). for _, v := range con {
Updates(map[string]interface{}{ for _, t := range task.Types {
"task_value": gorm.Expr("task_value + ?", task.Value), if (t == common.TaskTypeOnceRecharge || t == common.TaskTypeInvite || t == common.TaskTypeDownload) && v.Type == t { // 单次充值任务 || 首次充值任务 || v.Type == common.TaskTypeFirstRecharge)
}).Error data := GetUserTaskDataByTaskID(task.Uid, v.TaskID)
if err != nil { if data.ID == 0 {
log.Error("update task progress err, %+v:%d:%s", task, taskType, err.Error()) db.Mysql().Create(&common.TaskData{UID: uid, TaskID: v.TaskID, Time: now, Progress: v.Target})
continue } else if data.Progress == 0 {
db.Mysql().Update(&common.TaskData{UID: uid, TaskID: v.TaskID}, map[string]interface{}{"progress": v.Target, "time": now})
}
taskId = v.TaskID
break
} else if (t == common.TaskTypeBet1000 || t == common.TaskTypeBet10000 || t == common.TaskTypePlayGame) && v.Type == t {
data := GetUserTaskDataByTaskID(task.Uid, v.TaskID)
if data.ID == 0 {
db.Mysql().Create(&common.TaskData{UID: uid, TaskID: v.TaskID, Time: now, Progress: task.Value})
} else {
db.Mysql().Update(&common.TaskData{UID: uid, TaskID: v.TaskID}, map[string]interface{}{"progress": gorm.Expr("progress + ?", task.Value), "time": now})
}
taskId = v.TaskID
break
}
} }
} }
return return

@ -633,7 +633,7 @@ func UpdatePlayerProfile(data *common.ESGameData) error {
// 更新vip // 更新vip
UpdateVip(uid, 0, bet, settle) UpdateVip(uid, 0, bet, settle)
// 检查任务 // 检查任务
CheckTask(Task{Uid: uid, Value: bet, Types: []common.TaskType{common.TaskTypeBet}}) CheckTask(Task{Uid: uid, Value: bet / 100, Types: []common.TaskType{common.TaskTypePlayGame, common.TaskTypeBet1000, common.TaskTypeBet10000}})
// 日打码量 // 日打码量
playerData := GetPlayerData(uid) playerData := GetPlayerData(uid)
updates := make(map[string]interface{}) updates := make(map[string]interface{})
@ -693,23 +693,18 @@ func GetUserNeedBet(uid int) int64 {
return pro.NeedBet return pro.NeedBet
} }
func GetUserTaskData(uid int) (ret []*common.TaskData) { func GetUserTaskData(uid int) (ret []common.TaskData) {
if uid == 0 { if uid == 0 {
return return
} }
db.Mysql().QueryAll(fmt.Sprintf("uid = %d and (end_at >= %d or end_at = -1)", uid, time.Now().Unix()), "task_status >= 0", &common.TaskData{}, &ret) db.Mysql().QueryAll(fmt.Sprintf("uid = %d", uid), "", &common.TaskData{}, &ret)
return return
} }
func GetUserTaskDataByTaskID(uid, taskID int) (result common.TaskData, err error) { func GetUserTaskDataByTaskID(uid, taskID int) *common.TaskData {
err = db.Mysql().C().Model(&common.TaskData{}). data := &common.TaskData{UID: uid, TaskID: taskID}
Where("uid = ? and task_id = ? and (end_at >= ? or end_at = -1)", uid, taskID, time.Now().Unix()). db.Mysql().GetLast(data)
Find(&result).Error return data
if err != nil {
log.Error("get user task data err, %s", err.Error())
return
}
return
} }
func UpdateUserNeedBet(uid int, amount int64) { func UpdateUserNeedBet(uid int, amount int64) {

@ -54,7 +54,6 @@ const (
RedisKeyWeekCard = "week_card" RedisKeyWeekCard = "week_card"
RedisKeyUserPay = "user_pay" RedisKeyUserPay = "user_pay"
RedisKeyFirstRechargeBack = "first_recharge_back" RedisKeyFirstRechargeBack = "first_recharge_back"
RedisKeyTask = "task"
) )
const ( const (
@ -230,7 +229,3 @@ func GetRedisKeyUserPay(payChannelId, uid, amount int) string {
func GetRedisKeyFirstRechargeBack(uid int) string { func GetRedisKeyFirstRechargeBack(uid int) string {
return fmt.Sprintf("%v:%v", RedisKeyFirstRechargeBack, uid) return fmt.Sprintf("%v:%v", RedisKeyFirstRechargeBack, uid)
} }
func GetRedisKeyTask(uid int) string {
return fmt.Sprintf("%v:%v", RedisKeyTask, uid)
}

@ -1,18 +1,16 @@
package common package common
import "time"
type TaskType int type TaskType int
const ( const (
TaskTypeZero TaskType = iota TaskTypeZero TaskType = iota
TaskTypeInviter // 邀请好友 TaskTypeOnceRecharge // 单次充值任务
TaskTypeRecharge // 充值次数 TaskTypeInvite // 邀请好友
TaskTypeBet // 累计下注 TaskTypePlayGame // 参与一次牌局
TaskTypeUnlockWeekCard // 解锁周卡 TaskTypeBet1000 // 累计下注1000
TaskTypeJoinChannel // 加入频道 TaskTypeBet10000 // 累计下注10000
TaskTypeDownload // app下载 TaskTypeDownload // app下载
TaskTypeAll
) )
// TaskTypeFirstRecharge // 首次充值任务 // TaskTypeFirstRecharge // 首次充值任务
@ -59,22 +57,16 @@ const (
// Type 1注册 2下载 3累充 4单次充 // Type 1注册 2下载 3累充 4单次充
type ConfigTask struct { type ConfigTask struct {
ID int `gorm:"primary_key;AUTO_INCREMENT;column:id"` ID int `gorm:"primary_key;AUTO_INCREMENT;column:id"`
Open int `gorm:"column:open;type:int(11);default:1;comment:开关 1打开" web:"open"`
TaskID int `gorm:"column:task_id;type:int(11);default:0;uniqueIndex:task_id;comment:任务id" web:"task_id"` TaskID int `gorm:"column:task_id;type:int(11);default:0;uniqueIndex:task_id;comment:任务id" web:"task_id"`
Target int64 `gorm:"column:target;type:bigint(20);default:0;comment:任务目标" web:"target"` Target int64 `gorm:"column:target;type:bigint(20);default:0;comment:任务目标" web:"target"`
Reward int64 `gorm:"column:reward;type:bigint(20);default:0;comment:奖励" web:"reward"` Reward int64 `gorm:"column:reward;type:bigint(20);default:0;comment:奖励" web:"reward"`
Type TaskType `gorm:"column:type;type:int(11);default:1;comment:任务类型(1:邀请玩家注册,2:充值,3:下注额,4:解锁周卡,5:订阅频道)" web:"type"` Open int `gorm:"column:open;type:int(11);default:1;comment:开关 1打开" web:"open"`
Cycle int `gorm:"column:cycle;type:int(11);default:1;comment:1每日 2每周 3每月 4单次" web:"cycle"` Kind int `gorm:"column:kind;type:int(11);default:1;comment:1单次 2循环 3 每日一次" web:"kind"`
Sort int `gorm:"column:sort;type:int(11);default:0;comment:排序" web:"sort"` Type TaskType `gorm:"column:type;type:int(11);default:1;comment:1注册 2下载" web:"type"`
Title string `gorm:"column:title;type:varchar(256);default:'';comment:标题" web:"title"` Title string `gorm:"column:title;type:varchar(256);default:'';comment:标题" web:"title"`
Remark string `gorm:"column:remark;type:varchar(256);default:'';comment:备注" web:"remark"` Icon string `gorm:"column:icon;type:varchar(256);default:'';comment:图标" web:"icon"`
PreTaskId int `gorm:"column:pre_task_id;type:int(11);default:0;comment:前置任务id" web:"pre_task_id"` Sort int `gorm:"column:sort;type:int(11);default:0;comment:排序" web:"sort"`
Url string `gorm:"column:url;type:varchar(256);default:'';comment:跳转链接" web:"url"` Action int `gorm:"column:action;type:int(11);default:1;comment:跳转类型" web:"action"`
}
type ConfigTaskStr struct {
*ConfigTask
Exist bool
} }
func (c *ConfigTask) TableName() string { func (c *ConfigTask) TableName() string {
@ -82,15 +74,11 @@ func (c *ConfigTask) TableName() string {
} }
type TaskData struct { type TaskData struct {
ID int64 `gorm:"primary_key;AUTO_INCREMENT;column:id"` // 自增id ID int `gorm:"primary_key;AUTO_INCREMENT;column:id" json:"ID"`
UID int `gorm:"column:uid;type:int(11);not null;uniqueIndex:task_idx,priority:1;comment:玩家id" json:"uid"` // 玩家id UID int `gorm:"column:uid;not null;type:int(11);uniqueIndex:uid" json:"UID"`
TaskID int `gorm:"column:task_id;type:int(11);not null;uniqueIndex:task_idx,priority:2;comment:任务id" json:"task_id"` // 任务id Time int64 `gorm:"column:time;not null;type:bigint(20);default:0;comment:任务生成时间" json:"Time"`
TaskType int `gorm:"column:task_type;type:int(11);not null;comment:任务类型(1:邀请玩家注册,2:充值,3:下注额,4:解锁周卡,5:订阅频道)" json:"task_type"` // 任务类型(1:邀请玩家注册,2:充值,3:下注额,4:解锁周卡,5:订阅频道) TaskID int `gorm:"column:task_id;type:int(11);default:0;uniqueIndex:uid;comment:任务id" web:"task_id"`
TaskValue int `gorm:"column:task_value;type:int(11);not null;comment:任务值" json:"task_value"` // 任务值 Progress int64 `gorm:"column:progress;type:bigint(20);default:0;comment:进度" web:"progress"`
TaskStatus int `gorm:"column:task_status;type:int(11);not null;comment:任务状态(-1:未开启,0:未完成,1:已完成,2:已领取)" json:"task_status"` // 任务状态(-1:未开启,0:未完成,1:已完成,2:已领取)
EndAt int64 `gorm:"column:end_at;type:bigint(20);not null;comment:任务终止时间" json:"end_at"` // 任务终止时间
CreatedAt time.Time `gorm:"column:created_at;type:datetime;not null;comment:创建时间" json:"created_at"` // 创建时间
UpdatedAt time.Time `gorm:"column:updated_at;type:datetime;not null;comment:更新时间" json:"updated_at"` // 更新时间
} }
func (c *TaskData) TableName() string { func (c *TaskData) TableName() string {

@ -47,7 +47,7 @@ func GetGameUserRechargeHistory(c *gin.Context) {
successCount := db.Mysql().Count(&common.RechargeOrder{}, fmt.Sprintf("uid = %v and (event = %v or event = %v or event = %v) and status = %v", req.UID, common.CurrencyEventReCharge, common.CurrencyEventGMRecharge, common.CurrencyEventActivityWeekCard, common.StatusROrderPay)) successCount := db.Mysql().Count(&common.RechargeOrder{}, fmt.Sprintf("uid = %v and (event = %v or event = %v or event = %v) and status = %v", req.UID, common.CurrencyEventReCharge, common.CurrencyEventGMRecharge, common.CurrencyEventActivityWeekCard, common.StatusROrderPay))
resp.RechargeSuccessPer = utils.GetPer(successCount, resp.RechargeCount) resp.RechargeSuccessPer = utils.GetPer(successCount, resp.RechargeCount)
} else if req.OrderID != "" { } else if req.OrderID != "" {
resp.Count, _ = db.Mysql().QueryList(req.Page-1, req.Num, fmt.Sprintf(`(event = %v or event = %v) and (apipayid = "%v" or orderid = "%v")`, common.CurrencyEventReCharge, common.CurrencyEventActivityWeekCard, req.OrderID, req.OrderID), "create_time desc", &common.RechargeOrder{}, &ret) resp.Count, _ = db.Mysql().QueryList(req.Page-1, req.Num, fmt.Sprintf(`event = %v or event = %v and (apipayid = "%v" or orderid = "%v")`, common.CurrencyEventReCharge, common.CurrencyEventActivityWeekCard, req.OrderID, req.OrderID), "create_time desc", &common.RechargeOrder{}, &ret)
// log.Debug("ret:%v", ret) // log.Debug("ret:%v", ret)
for _, v := range ret { for _, v := range ret {
resp.List = append(resp.List, values.OneRechargeList{UID: v.UID, Time: v.CreateTime, CallbackTime: v.CallbackTime, CurrencyType: v.CurrencyType, resp.List = append(resp.List, values.OneRechargeList{UID: v.UID, Time: v.CreateTime, CallbackTime: v.CallbackTime, CurrencyType: v.CurrencyType,

@ -2,7 +2,6 @@ package handler
import ( import (
"fmt" "fmt"
"gorm.io/gorm/clause"
"math/rand" "math/rand"
"server/call" "server/call"
"server/common" "server/common"
@ -23,106 +22,74 @@ import (
// GetUserTaskStatus 获取任务状态 // GetUserTaskStatus 获取任务状态
func GetUserTaskStatus(a *app.Gin) (ret []*values.OneTask) { func GetUserTaskStatus(a *app.Gin) (ret []*values.OneTask) {
userTask := call.GetUserTaskData(a.UID) tasks := call.GetConfigTask()
taskCfgs := call.GetConfigTask() for _, v := range tasks {
taskMap := make(map[int]*common.ConfigTaskStr) // 任务列表 one := &values.OneTask{
userTaskMap := make(map[int]*common.TaskData) ID: v.ID,
preTask := make(map[int]struct{}) TaskID: v.TaskID,
var update bool Target: v.Target,
for _, v := range taskCfgs { Reward: v.Reward,
taskMap[v.TaskID] = &common.ConfigTaskStr{ Kind: v.Kind,
ConfigTask: v, Type: int(v.Type),
} Icon: v.Icon,
if v.PreTaskId > 0 { Title: common.GetTaskTitle(v),
preTask[v.PreTaskId] = struct{}{} Action: v.Action,
} }
} // 非次数任务,需转换目标数值
for _, v := range userTask { // if !common.IsNumTaskType(v.Type) {
if _, ok := taskMap[v.TaskID]; !ok { // 不存在则删除 // one.Target /= common.DecimalDigits
db.Mysql().Del(&common.TaskData{}, " id = ?", v.ID) // }
update = true ret = append(ret, one)
continue
} else {
taskMap[v.TaskID].Exist = true
} }
if a.UID <= 0 {
return
} }
for _, v := range taskMap { now := time.Now()
if !v.Exist { // 不存在/失效的 则创建/更新 task := call.GetUserTaskData(a.UID)
update = true for _, v := range ret {
task := &common.TaskData{ for _, k := range task {
UID: a.UID, if v.TaskID == k.TaskID {
TaskID: v.TaskID, v.Progess = k.Progress
TaskType: int(v.Type), taskTime := time.Unix(k.Time, 0)
TaskValue: 0, // 跨天清空数据
TaskStatus: 0, if !util.IsSameDay(now, taskTime) && v.Kind == common.TaskKindDayOne {
EndAt: 0, v.Status = 0
CreatedAt: time.Now(), v.Progess = 0
UpdatedAt: time.Now(), err := db.Mysql().Update(&k, map[string]interface{}{
} "progress": 0,
switch v.Cycle { "time": now.Unix(),
case 1: })
task.EndAt = util.GetZeroTime(time.Now().AddDate(0, 0, 1)).Unix()
case 2:
task.EndAt = util.GetWeekZeroTime(time.Now().AddDate(0, 0, 7)).Unix()
case 3:
task.EndAt = util.GetFirstDateOfMonth(time.Now().AddDate(0, 1, 0)).Unix()
case 4:
task.EndAt = -1
}
err := db.Mysql().C().Model(&common.TaskData{}).Clauses(clause.OnConflict{
Columns: []clause.Column{{Name: "uid"}, {Name: "task_id"}},
DoUpdates: clause.Assignments(map[string]interface{}{
"task_type": task.TaskType,
"task_value": task.TaskValue,
"task_status": task.TaskStatus,
"end_at": task.EndAt,
"updated_at": task.UpdatedAt,
}),
}).Create(task).Error
if err != nil { if err != nil {
log.Error("create task err, %s", err.Error()) log.Error("GetUserTaskStatus err:%v", err)
continue
}
}
} }
if update {
userTask = call.GetUserTaskData(a.UID)
} }
break
for _, v := range userTask {
userTaskMap[v.TaskID] = v
} }
ret = make([]*values.OneTask, 0, len(userTask))
for _, v := range userTask {
if taskMap[v.TaskID].PreTaskId > 0 && userTaskMap[taskMap[v.TaskID].PreTaskId].TaskStatus != 2 {
continue
} }
if _, ok := preTask[v.TaskID]; ok && v.TaskStatus == 2 { if v.Type == int(common.TaskTypeDownload) && v.Progess != -1 { // 已下载直接标记为完成
continue if a.DeviceType == common.DeviceTypeWebview || a.DeviceType == common.DeviceTypePWA {
// 直接领取下载奖励
taskId := call.CheckTask(call.Task{Uid: a.UID, Value: 0, Types: []common.TaskType{common.TaskTypeDownload}})
TaskComplete(a, &DrawTaskReq{TaskID: taskId})
a.Code = values.CodeOK
a.Msg = ""
} }
oneTask := &values.OneTask{
TaskID: v.TaskID,
Progress: int64(v.TaskValue),
Target: taskMap[v.TaskID].Target,
Reward: taskMap[v.TaskID].Reward,
Cycle: taskMap[v.TaskID].Cycle,
TaskType: int(taskMap[v.TaskID].Type),
Status: v.TaskStatus,
Title: taskMap[v.TaskID].Title,
Url: taskMap[v.TaskID].Url,
Sort: taskMap[v.TaskID].Sort,
} }
if oneTask.Progress >= oneTask.Target && oneTask.Status != 2 { // 非次数任务,需转换目标数值
oneTask.Status = 1 // if !common.IsNumTaskType(v.Type) && v.Progess > 0 {
// v.Progess /= common.DecimalDigits
// }
if v.Progess < 0 {
v.Progess = v.Target
v.Status = 2
} else if v.Progess >= v.Target {
v.Progess = v.Target
v.Status = 1
} }
ret = append(ret, oneTask)
} }
sort.SliceStable(ret, func(i, j int) bool { sort.SliceStable(ret, func(i, j int) bool {
return ret[i].Sort > ret[j].Sort return ret[i].Status > ret[j].Status
}) })
return return
} }

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

@ -8,8 +8,6 @@ import (
"server/db" "server/db"
"server/modules/web/app" "server/modules/web/app"
"server/modules/web/values" "server/modules/web/values"
"server/pb"
"time"
) )
// Record 领奖进度,key为taskid,value为任务进度,小与0时表示已领取 // Record 领奖进度,key为taskid,value为任务进度,小与0时表示已领取
@ -32,7 +30,7 @@ func GetTaskInfo(c *gin.Context) {
} }
} }
if num > 0 { if num > 0 {
call.PushRed(a.UID, pb.RedPointModule_RedPointTaskDraw, uint32(num)) //call.PushRed(a.UID, pb.RedPointModule_RedPointTask, uint32(num))
} }
} }
@ -40,56 +38,41 @@ type DrawTaskReq struct {
TaskID int TaskID int
} }
type DrawTaskResp struct { func TaskComplete(a *app.Gin, req *DrawTaskReq) {
TaskID int
Award int64
}
func TaskComplete(a *app.Gin, req *DrawTaskReq) (reward int64) {
if !db.Redis().Lock(common.GetRedisKeyTask(a.UID)) {
a.Code = values.CodeRetry
return
}
defer func() {
db.Redis().UnLock(common.GetRedisKeyTask(a.UID))
}()
con := call.GetConfigTaskByTaskID(req.TaskID) con := call.GetConfigTaskByTaskID(req.TaskID)
if con == nil { if con == nil {
a.Code = values.CodeRetry a.Code = values.CodeRetry
return return
} }
task, err := call.GetUserTaskDataByTaskID(a.UID, req.TaskID) task := call.GetUserTaskDataByTaskID(a.UID, req.TaskID)
if err != nil { if task.Progress < con.Target {
log.Error("get task data err, %s ", err.Error())
a.Code = values.CodeRetry
return
}
if task.ID == 0 {
a.Code = values.CodeRetry
return
}
if task.TaskValue < int(con.Target) {
a.Code = values.CodeParam a.Code = values.CodeParam
a.Msg = "Task not complete." a.Msg = "Task not complete."
return return
} }
err = db.Mysql().Update(&common.TaskData{ID: task.ID}, map[string]interface{}{ var rows int64
"task_status": 2, var err error
"updated_at": time.Now(), if con.Kind == common.TaskKindOnce || con.Kind == common.TaskKindDayOne {
}) rows, err = db.Mysql().UpdateRes(&common.TaskData{UID: a.UID, TaskID: req.TaskID, Progress: task.Progress}, map[string]interface{}{"progress": -1})
} else if con.Kind == common.TaskKindCycle {
rows, err = db.Mysql().UpdateRes(&common.TaskData{UID: a.UID, TaskID: req.TaskID, Progress: task.Progress}, map[string]interface{}{"progress": 0})
}
if err != nil { if err != nil {
log.Error("update task status err, %s", err.Error()) log.Error("err:%v", err)
a.Code = values.CodeRetry a.Code = values.CodeRetry
return return
} }
reward = con.Reward if rows == 0 {
if reward == 0 { a.Code = values.CodeRetry
return
}
if con.Reward <= 0 {
return return
} }
_, err = call.UpdateCurrencyPro(&common.UpdateCurrency{ _, err = call.UpdateCurrencyPro(&common.UpdateCurrency{
CurrencyBalance: &common.CurrencyBalance{ CurrencyBalance: &common.CurrencyBalance{
UID: a.UID, UID: a.UID,
Value: reward, Value: con.Reward,
Event: common.CurrencyEventTask, Event: common.CurrencyEventTask,
Type: common.CurrencyINR, Type: common.CurrencyINR,
Exi1: req.TaskID, Exi1: req.TaskID,
@ -100,7 +83,6 @@ func TaskComplete(a *app.Gin, req *DrawTaskReq) (reward int64) {
a.Code = values.CodeRetry a.Code = values.CodeRetry
return return
} }
return
} }
func DrawTask(c *gin.Context) { func DrawTask(c *gin.Context) {
@ -112,36 +94,13 @@ func DrawTask(c *gin.Context) {
if !a.S(req) { if !a.S(req) {
return return
} }
resp := &DrawTaskResp{ TaskComplete(a, req)
TaskID: req.TaskID, a.Data = req
Award: TaskComplete(a, req),
}
a.Data = resp
num := 0 num := 0
for _, task := range GetUserTaskStatus(a) { for _, task := range GetUserTaskStatus(a) {
if task.Status == 1 { if task.Status == 1 {
num++ num++
} }
} }
call.PushRed(a.UID, pb.RedPointModule_RedPointTaskDraw, uint32(num)) //call.PushRed(a.UID, pb.RedPointModule_RedPointTask, uint32(num))
}
type JoinChannelReq struct {
}
func JoinChannel(c *gin.Context) {
a := app.NewApp(c)
defer func() {
a.Response()
}()
req := &JoinChannelReq{}
if !a.S(req) {
return
}
uid := a.UID
call.CheckTask(call.Task{
Uid: uid,
Value: 1,
Types: []common.TaskType{common.TaskTypeJoinChannel},
})
} }

@ -364,32 +364,31 @@ func newContext(c *gin.Context) *gin.Context {
// CheckTask 完成任务 // CheckTask 完成任务
func CheckTask(a *app.Gin) { func CheckTask(a *app.Gin) {
GetUserTaskStatus(a) var taskList []*values.OneTask
//var taskList []*values.OneTask tasks := call.GetConfigTask()
//tasks := call.GetConfigTask() for _, v := range tasks {
//for _, v := range tasks { one := &values.OneTask{
// one := &values.OneTask{ ID: v.ID,
// ID: v.ID, TaskID: v.TaskID,
// TaskID: v.TaskID, Target: v.Target,
// Target: v.Target, Reward: v.Reward,
// Reward: v.Reward, Kind: v.Kind,
// Kind: v.Kind, Type: int(v.Type),
// Type: int(v.Type), Icon: v.Icon,
// Icon: v.Icon, Title: common.GetTaskTitle(v),
// Title: common.GetTaskTitle(v), Action: v.Action,
// Action: v.Action, }
// } taskList = append(taskList, one)
// taskList = append(taskList, one) }
//} for _, v := range taskList {
//for _, v := range taskList { if v.Type == int(common.TaskTypeDownload) && v.Progess != -1 { // 已下载直接标记为完成
// if v.Type == int(common.TaskTypeDownload) && v.Progess != -1 { // 已下载直接标记为完成 if a.DeviceType == common.DeviceTypeWebview || a.DeviceType == common.DeviceTypePWA {
// if a.DeviceType == common.DeviceTypeWebview || a.DeviceType == common.DeviceTypePWA { // 直接领取下载奖励
// // 直接领取下载奖励 taskId := call.CheckTask(call.Task{Uid: a.UID, Value: 0, Types: []common.TaskType{common.TaskTypeDownload}})
// taskId := call.CheckTask(call.Task{Uid: a.UID, Value: 0, Types: []common.TaskType{common.TaskTypeDownload}}) TaskComplete(a, &DrawTaskReq{TaskID: taskId})
// TaskComplete(a, &DrawTaskReq{TaskID: taskId}) }
// } }
// } }
//}
} }
func CheckRedPoint(uid int, c *gin.Context) { func CheckRedPoint(uid int, c *gin.Context) {
// 防止玩家未连接网关,所以延迟3秒 // 防止玩家未连接网关,所以延迟3秒

@ -9,5 +9,4 @@ import (
func task(e *gin.RouterGroup) { func task(e *gin.RouterGroup) {
e.POST("/task/info", handler.GetTaskInfo) e.POST("/task/info", handler.GetTaskInfo)
e.POST("/task/draw", handler.DrawTask) e.POST("/task/draw", handler.DrawTask)
e.POST("/task/joinChannel", handler.JoinChannel)
} }

@ -1,14 +1,19 @@
package values package values
// Kind 1单次 2循环
// Type 1注册 2下载 3累充 4单次充
// Progess 进度
// Status 0未完成 1已完成 2已领取
type OneTask struct { type OneTask struct {
TaskID int // 任务id ID int
Progress int64 // 进度 TaskID int
Target int64 // 任务值 Target int64
Reward int64 // 奖励数值 Reward int64
Cycle int // 周期(1每日 2每周 3每月 4单次) Kind int
TaskType int // 任务类型(1:邀请玩家注册,2:充值次数,3:下注额,4:解锁周卡,5:订阅频道) Type int
Status int // 0未完成,1已完成,2已领取 Progess int64
Title string // 标题 Status int
Url string // 跳转链接 Title string
Sort int // 排序 Icon string
Action int
} }

@ -72,7 +72,6 @@ enum RedPointModule{
RedPointCashBack = 7; // RedPointCashBack = 7; //
RedPointPdd = 8; // pdd次数 RedPointPdd = 8; // pdd次数
RedPointMailPersonal = 9; // - RedPointMailPersonal = 9; // -
RedPointTaskDraw = 10; //
} }
message RedInfo { message RedInfo {

Loading…
Cancel
Save