From e17383807a12413ec429f9de5a8e6188d60b5044 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 9 Sep 2020 16:55:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index 7b10a7d50..2441dbbe8 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -300,7 +300,7 @@ func formalizeStoreSkuList(inSkuList []*dao.StoreSkuSyncInfo) []*dao.StoreSkuSyn
 			skuItem.MergedStatus = jxutils.MergeSkuStatus(jxutils.MergeSkuStatus(skuItem.NameStatus, skuItem.Status), skuItem.StoreSkuStatus)
 			skuItem.SkuName = jxutils.ComposeSkuNameSync(skuItem.Prefix, skuItem.Name, skuItem.Comment, skuItem.Unit, skuItem.SpecQuality, skuItem.SpecUnit, 0, skuItem.ExPrefix, skuItem.ExPrefixBegin, skuItem.ExPrefixEnd)
 			skuItem.SkuNameOrigin = jxutils.ComposeSkuNameOriginal(skuItem.Prefix, skuItem.Name, skuItem.Comment, skuItem.Unit, skuItem.SpecQuality, skuItem.SpecUnit, 0)
-			if skuItem.ImgWatermark != "" {
+			if skuItem.ImgWatermark != "" && model.IsSyncStatusUpdate(skuItem.SkuSyncStatus) {
 				if utils.Time2Date(time.Now().Add(6*time.Hour)).Sub(*skuItem.ExPrefixBegin) >= 0 && utils.Time2Date(time.Now()).Sub(*skuItem.ExPrefixEnd) <= 0 {
 					downLoad, _ := uploadImgStandard(skuItem.ImgWatermark)
 					skuItem.ImgMix = jxutils.MixWatermarkImg(downLoad, skuItem.ImgOrigin, skuItem.ExPrefixBegin, skuItem.ExPrefixEnd)
@@ -424,15 +424,9 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 	} else {
 		skus, err = dao.GetStoreSkus(db, vendorID, storeID, skuIDs)
 	}
-	if storeID == 667481 {
-		fmt.Println("fffffffffffffffffffffffffffffffffffffffffffffff1", len(skus))
-	}
 	if err != nil || len(skus) == 0 {
 		return err
 	}
-	if storeID == 667481 {
-		fmt.Println("fffffffffffffffffffffffffffffffffffffffffffffff2", len(skus))
-	}
 	if len(excludeSkuIDs) > 0 {
 		excludeSkuMap := jxutils.IntList2Map(excludeSkuIDs)
 		var skus2 []*dao.StoreSkuSyncInfo
@@ -443,6 +437,9 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 		}
 		skus = skus2
 	}
+	if storeID == 667481 {
+		fmt.Println("gggggggggggggggggggggg1", len(skus))
+	}
 	formalizeStoreSkuList(skus)
 	//京东商城的商品名规则不同
 	// name，空格，comment，约xxg
@@ -450,7 +447,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 	// 	formalizeStoreSkuListForJds(skus)
 	// }
 	if storeID == 667481 {
-		fmt.Println("fffffffffffffffffffffffffffffffffffffffffffffff3", len(skus))
+		fmt.Println("gggggggggggggggggggggg2", len(skus))
 	}
 	singleStoreHandler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreStoreSkuHandler)
 	storeSkuHandler := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IPurchasePlatformStoreSkuHandler)