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

修复不同类型的判断

Browse Source
This commit is contained in:
wh_zcy 2022-09-20 20:47:04 +08:00
parent 053f57bd07
commit e9b29d0e6b
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/v2/ui/views/task_activelist.go
View File

@ -56,7 +56,7 @@ func (this *TaskActiveListView) CreateView(t *model.TestCase) fyne.CanvasObject
}
if err := service.GetPttService().SendToClient(
t.MainType, "activereceive",
&pb.TaskReceiveReq{Id: this.selItemIds[0], TaskTag: cast.ToInt32(tagSelect.Selected)}); err != nil {
&pb.TaskActiveReceiveReq{Id: this.selItemIds[0], TaskTag: cast.ToInt32(tagSelect.Selected)}); err != nil {
logrus.Error(err)
return
}

22
modules/task/api_activereceive.go
View File

@ -63,10 +63,23 @@ func (this *apiComp) ActiveReceive(session comm.IUserSession, req *pb.TaskActive
return
}
if ue.Activeday >= conf.Active {
update := map[string]interface{}{
"received": 1, //标识已领取
update := make(map[string]interface{})
if req.TaskTag == int32(comm.TASK_DAILY) {
if ue.Activeday >= conf.Active {
update["received"] = 1
} else {
code = pb.ErrorCode_TaskActiveNoenough
return
}
} else if req.TaskTag == int32(comm.TASK_WEEKLY) {
if ue.Activeweek >= conf.Active {
update["received"] = 1
} else {
code = pb.ErrorCode_TaskActiveNoenough
return
}
}
if len(update) > 0 {
if err := this.moduleTask.modelTaskActive.updateReceive(session.GetUserId(),
ua.Id,
comm.TaskTag(req.TaskTag),
@ -75,9 +88,6 @@ func (this *apiComp) ActiveReceive(session comm.IUserSession, req *pb.TaskActive
code = pb.ErrorCode_DBError
return
}
} else {
code = pb.ErrorCode_TaskActiveNoenough
return
}
//派发奖励