diff --git a/modules/buried/module.go b/modules/buried/module.go index 07f353fe0..f414691ff 100644 --- a/modules/buried/module.go +++ b/modules/buried/module.go @@ -134,6 +134,22 @@ func (this *Buried) CheckCondition(uid string, condiIds ...int32) (condis []*pb. for _, v1 := range bdata.Condi { if v1.Conid == v { ok = true + //状态等于休眠 + if v1.State == pb.BuriedItemState_Sleep { + if conf.Ctype == ctype_daily { //日常 + if !utils.IsToday(v1.Timestamp) { //不是同一天 可以重置数据 + v1.State = pb.BuriedItemState_Activated + v1.Value = 0 + v1.Finish = pb.BuriedItemFinishState_buried_unfinish + } + } else if conf.Ctype == ctype_weekly { //周常 + if !utils.IsSameWeek(v1.Timestamp) { //不是同一周 + v1.State = pb.BuriedItemState_Activated + v1.Value = 0 + v1.Finish = pb.BuriedItemFinishState_buried_unfinish + } + } + } condis = append(condis, &pb.ConIProgress{ Btype: conf.Type, Conid: v1.Conid,