diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go index 80d5aa46b..b2d1586c7 100644 --- a/business/jxstore/cms/sync.go +++ b/business/jxstore/cms/sync.go @@ -1254,22 +1254,29 @@ func SyncSkuExperfixAndWatermark(ctx *jxcontext.Context) (err error) { task := tasksch.NewParallelTask("SyncSkuExperfixAndWatermark", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { skuExinfo := batchItemList[0].(*model.SkuExinfoMap) - if time.Now().Sub(skuExinfo.EndAt) > 0 { + if utils.Time2Date(time.Now().Add(6*time.Hour)).Sub(skuExinfo.EndAt) > 0 { skuExinfo.DeletedAt = time.Now() dao.UpdateEntity(db, skuExinfo, "DeletedAt") + goto setModifiyFlag } - skus, err := dao.GetSkus(db, nil, []int{skuExinfo.NameID}, nil, nil, nil) - var skuIDs []int - for _, v := range skus { - skuIDs = append(skuIDs, v.ID) + if utils.Time2Date(time.Now().Add(6*time.Hour)).Sub(skuExinfo.BeginAt) == 0 { + goto setModifiyFlag } - if partner.IsMultiStore(skuExinfo.VendorID) { - for _, v := range skuIDs { - OnUpdateThing(ctx, db, nil, int64(v), model.ThingTypeSku) + setModifiyFlag: + { + skus, _ := dao.GetSkus(db, nil, []int{skuExinfo.NameID}, nil, nil, nil) + var skuIDs []int + for _, v := range skus { + skuIDs = append(skuIDs, v.ID) } - } else { - if len(skuIDs) > 0 { - SetStoreSkuSyncStatus2(db, nil, []int{skuExinfo.VendorID}, skuIDs, model.SyncFlagModifiedMask) + if partner.IsMultiStore(skuExinfo.VendorID) { + for _, v := range skuIDs { + OnUpdateThing(ctx, db, nil, int64(v), model.ThingTypeSku) + } + } else { + if len(skuIDs) > 0 { + SetStoreSkuSyncStatus2(db, nil, []int{skuExinfo.VendorID}, skuIDs, model.SyncFlagModifiedMask) + } } } return retVal, err diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index c8e3c1fa4..d69a6951c 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -43,7 +43,7 @@ var ( "09:00:00", } dailyWorkTimeList = []string{ - "20:00:00", + "20:30:00", } dailyWorkTimeList2 = []string{ "02:00:00",