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

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
liwei 2023-07-05 10:07:59 +08:00
commit e9916d2df2
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/caravan/module.go
View File

@ -225,7 +225,7 @@ func (this *Caravan) refreshCaravanCityInfo(uid string, caravan *pb.DBCaravan) {
// 校验随机事件是否超时 // 校验随机事件是否超时
func (this *Caravan) CheckCaravanTask(session comm.IUserSession, data *pb.DBCaravan) (bTimeOut bool) { func (this *Caravan) CheckCaravanTask(session comm.IUserSession, data *pb.DBCaravan) (bTimeOut bool) {
if data.Eventid != 0 { if data.Tasktime != 0 {
if list, err := this.configure.GetCaravanEventById(data.Eventid); err == nil { if list, err := this.configure.GetCaravanEventById(data.Eventid); err == nil {
// 校验任务是否超时 // 校验任务是否超时
if configure.Now().Unix()-data.Tasktime > int64(list.Eventtime) { //TODO 任务超时 通知任务模块处理 并清理相关数据 if configure.Now().Unix()-data.Tasktime > int64(list.Eventtime) { //TODO 任务超时 通知任务模块处理 并清理相关数据
@ -238,6 +238,14 @@ func (this *Caravan) CheckCaravanTask(session comm.IUserSession, data *pb.DBCara
} }
this.CleanCaravanTask(session.GetUserId(), data) //任务超时 清理任务数据 this.CleanCaravanTask(session.GetUserId(), data) //任务超时 清理任务数据
data.Eventid = 0
data.Tasktime = 0
data.Eventid = 0
update := make(map[string]interface{})
update["eventid"] = data.Eventid
update["tasktime"] = data.Tasktime
update["eventid"] = data.Eventid
this.modelCaravan.modifyCaravanDataByObjId(session.GetUserId(), update)
// 任务超时发送任务失败推送 // 任务超时发送任务失败推送
resp := &pb.CaravanTaskCompletePush{} resp := &pb.CaravanTaskCompletePush{}
resp.Data = data resp.Data = data