From 6369046add82b2903f09394e0001495bb34abb58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 3 Aug 2020 18:24:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=8E=E5=9B=A2=E6=B5=8B=E8=AF=95=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go | 15 +++++++++++----
 business/model/model.go                |  4 ++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index fb66c0a57..b27914cb2 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -481,6 +481,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 			if !dao.IsVendorThingIDEmpty(sku.VendorSkuID) {
 				bareSku = storeSkuSyncInfo2Bare(sku)
 				if singleStoreHandler == nil {
+					bareSku.Stock = 0
 					stockList = append(stockList, bareSku)
 				} else {
 					deleteList = append(deleteList, bareSku)
@@ -556,15 +557,21 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 						}
 						if sku.MergedStatus == model.SkuStatusNormal {
 							onlineList = append(onlineList, bareSku)
-							stockList = append(stockList, bareSku)
+							// stockList = append(stockList, bareSku)
 						} else {
 							offlineList = append(offlineList, bareSku)
 							// 因为京东平台以是否有库存表示是否关注，所以不论是否可售，都要设置库存
-							if singleStoreHandler == nil {
-								stockList = append(stockList, bareSku)
-							}
+							// if singleStoreHandler == nil {
+							// 	stockList = append(stockList, bareSku)
+							// }
 						}
 					}
+					if model.IsSyncStatusStock(sku.SkuSyncStatus) {
+						if bareSku == nil {
+							bareSku = storeSkuSyncInfo2Bare(sku)
+						}
+						stockList = append(stockList, bareSku)
+					}
 				}
 				isNeedReorder = model.IsSyncStatusSeq(sku.SkuSyncStatus)
 			}
diff --git a/business/model/model.go b/business/model/model.go
index 6986d1e59..ad4108335 100644
--- a/business/model/model.go
+++ b/business/model/model.go
@@ -117,6 +117,10 @@ func IsSyncStatusPrice(syncStatus int8) bool {
 	return (syncStatus & SyncFlagPriceMask) != 0
 }
 
+func IsSyncStatusStock(syncStatus int8) bool {
+	return (syncStatus & SyncFlagStockMask) != 0
+}
+
 func IsSyncStatusSeq(syncStatus int8) bool {
 	return (syncStatus & SyncFlagSeqMask) != 0
 }