From c54a5689cd0c9fdce8db4755d77980049fd4c5af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 7 Jul 2020 08:36:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=89=8D=E7=BC=80=E6=89=93?=
 =?UTF-8?q?=E6=A0=87=E8=AE=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go
index 0b654b1ce..c4fc83f79 100644
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -1253,6 +1253,11 @@ 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 {
+				skuExinfo.DeletedAt = time.Now()
+				dao.UpdateEntity(db, skuExinfo, "DeletedAt")
+				return retVal, err
+			}
 			skus, err := dao.GetSkus(db, nil, []int{skuExinfo.NameID}, nil, nil, nil)
 			var skuIDs []int
 			for _, v := range skus {
@@ -1262,12 +1267,10 @@ func SyncSkuExperfixAndWatermark(ctx *jxcontext.Context) (err error) {
 				for _, v := range skuIDs {
 					OnUpdateThing(ctx, db, nil, int64(v), model.ThingTypeSku)
 				}
-				// CurVendorSync.SyncSkus(ctx, db, nil, skuIDs, true, true, ctx.GetUserName())
 			} else {
 				if len(skuIDs) > 0 {
 					SetStoreSkuSyncStatus2(db, nil, []int{skuExinfo.VendorID}, skuIDs, model.SyncFlagModifiedMask)
 				}
-				// CurVendorSync.SyncStoresSkus2(ctx, nil, 0, db, []int{skuExinfo.VendorID}, nil, false, skuIDs, nil, model.SyncFlagModifiedMask, true, true)
 			}
 			return retVal, err
 		}, skuExinfos)