From 1cc2787df07aab3a204504bcb1c21e3c4f5a7a26 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Wed, 5 Jul 2023 09:54:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=B6=85=E6=97=B6?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=EF=BC=8C=E6=B8=85=E7=A9=BA=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/caravan/module.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/caravan/module.go b/modules/caravan/module.go
index f06b0ac35..f8b01f115 100644
--- a/modules/caravan/module.go
+++ b/modules/caravan/module.go
@@ -238,6 +238,14 @@ func (this *Caravan) CheckCaravanTask(session comm.IUserSession, data *pb.DBCara
 				}
 
 				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.Data = data

From 7e07a0828f94b590ea27a474688dcc4025d17d73 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Wed, 5 Jul 2023 10:07:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?taskid=20=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/caravan/module.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/caravan/module.go b/modules/caravan/module.go
index f8b01f115..ff018553a 100644
--- a/modules/caravan/module.go
+++ b/modules/caravan/module.go
@@ -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) {
 
-	if data.Eventid != 0 {
+	if data.Tasktime != 0 {
 		if list, err := this.configure.GetCaravanEventById(data.Eventid); err == nil {
 			// 校验任务是否超时
 			if configure.Now().Unix()-data.Tasktime > int64(list.Eventtime) { //TODO 任务超时 通知任务模块处理 并清理相关数据