liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

growtask errdata

Browse Source
This commit is contained in:
wh_zcy 2023-06-06 15:10:55 +08:00
parent efab828c47
commit 015c649c04
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/growtask/api_advreceive.go
View File

@ -38,14 +38,20 @@ func (this *apiComp) Advreceive(session comm.IUserSession, req *pb.GrowtaskAdvRe
// 当前进阶奖励是否已领取 // 当前进阶奖励是否已领取
if gt.AdvReceive == req.TaskType { if gt.AdvReceive == req.TaskType {
code = pb.ErrorCode_GrowtaskAdvReceive errdata = &pb.ErrorData{
Code: pb.ErrorCode_GrowtaskAdvReceive,
Title: pb.ErrorCode_GrowtaskAdvReceive.ToString(),
}
return return
} }
// 当前进阶任务是否都完成 // 当前进阶任务是否都完成
ok := this.module.modelGrowtask.isAllFinish(gt, req.TaskType) ok := this.module.modelGrowtask.isAllFinish(gt, req.TaskType)
if !ok { if !ok {
code = pb.ErrorCode_GrowtaskAdvReceive errdata = &pb.ErrorData{
Code: pb.ErrorCode_GrowtaskAdvReceive,
Title: pb.ErrorCode_GrowtaskAdvReceive.ToString(),
}
return return
} }
@ -86,7 +92,7 @@ func (this *apiComp) Advreceive(session comm.IUserSession, req *pb.GrowtaskAdvRe
} }
if conf, ok := rewardCnf.GetDataMap()[req.TaskType]; ok { if conf, ok := rewardCnf.GetDataMap()[req.TaskType]; ok {
if code := this.module.DispenseRes(session, conf.Allreward, true); errdata != nil { if errdata := this.module.DispenseRes(session, conf.Allreward, true); errdata != nil {
this.module.Errorf("进阶奖励发放失败 taskType:%v uid:%v", req.TaskType, uid) this.module.Errorf("进阶奖励发放失败 taskType:%v uid:%v", req.TaskType, uid)
} }
} }
@ -95,8 +101,6 @@ func (this *apiComp) Advreceive(session comm.IUserSession, req *pb.GrowtaskAdvRe
TaskType: req.TaskType, TaskType: req.TaskType,
} }
if err := session.SendMsg(string(this.module.GetType()), GrowtaskSubTypeAdvreceive, rsp); err != nil { session.SendMsg(string(this.module.GetType()), GrowtaskSubTypeAdvreceive, rsp)
code = pb.ErrorCode_SystemError
}
return return
} }

11
modules/growtask/api_receive.go
View File

@ -26,7 +26,10 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.GrowtaskReceiveR
// 领取 // 领取
if err := this.module.modelGrowtask.receive(uid, req.TaskId); err != nil { if err := this.module.modelGrowtask.receive(uid, req.TaskId); err != nil {
code = pb.ErrorCode_GrowtaskReceive errdata = &pb.ErrorData{
Code: pb.ErrorCode_GrowtaskReceive,
Title: pb.ErrorCode_GrowtaskReceive.ToString(),
}
return return
} }
@ -50,7 +53,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.GrowtaskReceiveR
} }
if conf, ok := ggt.GetDataMap()[req.TaskId]; ok { if conf, ok := ggt.GetDataMap()[req.TaskId]; ok {
if code := this.module.DispenseRes(session, conf.Reward, true); errdata != nil { if errdata := this.module.DispenseRes(session, conf.Reward, true); errdata != nil {
this.module.Errorf("子任务奖励发放失败 taskId:%v uid:%v", req.TaskId, uid) this.module.Errorf("子任务奖励发放失败 taskId:%v uid:%v", req.TaskId, uid)
} }
} }
@ -59,8 +62,6 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.GrowtaskReceiveR
TaskId: req.TaskId, TaskId: req.TaskId,
} }
if err := session.SendMsg(string(this.module.GetType()), GrowtaskSubTypeReceive, rsp); err != nil { session.SendMsg(string(this.module.GetType()), GrowtaskSubTypeReceive, rsp)
code = pb.ErrorCode_SystemError
}
return return
} }

2
modules/growtask/model_growtask.go
View File

@ -114,7 +114,7 @@ func (this *ModelGrowtask) list(uid string, taskType int32, gt *pb.DBGrowtask) (
} }
//任务完成 //任务完成
if code := this.moduleGrowtask.ModuleRtask.CheckCondi(uid, v.Fstask); code == pb.ErrorCode_Success { if code := this.moduleGrowtask.ModuleRtask.CheckCondi(uid, v.Fstask); code == nil {
if v.PreTask == 0 { if v.PreTask == 0 {
v.Status = pb.GrowtaskStatus_Wait //待领奖状态 v.Status = pb.GrowtaskStatus_Wait //待领奖状态
} else { } else {