From 33e6ca5104bd0f0024abca5a96e66f0a0f5a4216 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Thu, 22 Jul 2021 09:43:18 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/sync_store_sku.go | 3 +++
 business/jxstore/misc/misc.go          | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index d673244ba..7b9db91c3 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -482,6 +482,9 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 		if vendorID == model.VendorIDMTWM && storeDetail.Status != model.StoreStatusOpened && storeDetail.AutoEnableAt != nil && storeDetail.AutoEnableAt.Sub(specailAutoEnableAt) == 0 && sku.MergedStatus == model.SkuStatusNormal {
 			sku.MergedStatus = model.SkuStatusDontSale
 		}
+		if sku.Status != model.SkuStatusNormal {
+			sku.MergedStatus = model.SkuStatusDontSale
+		}
 		var bareSku *partner.StoreSkuInfo
 		isNeedReorder := false
 		if isStoreSkuSyncNeedDelete(sku) {
diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index d40e276ce..8c0a3ca38 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -439,7 +439,7 @@ func syncStoreSku() {
 					errList.AddErr(err)
 
 					_, err = cms.CurVendorSync.SyncStoresSkus2(jxcontext.AdminCtx, nil, 0, db, []int{0}, nil, false, nil, []int{27379}, syncFlag, true, true)
-					// _, err = cms.CurVendorSync.FullSyncStoresSkus(jxcontext.AdminCtx, db, partner.GetMultiStoreVendorIDs(), nil, false, []int{27379}, true, true)
+					//_, err = cms.CurVendorSync.FullSyncStoresSkus(jxcontext.AdminCtx, db, partner.GetMultiStoreVendorIDs(), nil, false, []int{27379}, true, true)
 					errList.AddErr(err)
 				}
 			case 1: