From 06594330a5d1a761cddb3e8fb819a8e7aa97d942 Mon Sep 17 00:00:00 2001
From: Rosy-zhudan <donmicro@qq.com>
Date: Tue, 13 Aug 2019 14:53:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E6=AF=94=E8=BE=83=E5=BE=85=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E4=B8=94=E4=B8=8D=E5=8F=AF=E5=94=AE=E7=9A=84=EF=BC=8C?=
 =?UTF-8?q?=E4=BA=AC=E8=A5=BF=E6=9C=89=E5=B9=B3=E5=8F=B0=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E7=9A=84=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store_sku_check.go | 28 +++++++++++++++----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/business/jxstore/cms/store_sku_check.go b/business/jxstore/cms/store_sku_check.go
index f3122f2a2..abfaff712 100644
--- a/business/jxstore/cms/store_sku_check.go
+++ b/business/jxstore/cms/store_sku_check.go
@@ -165,6 +165,18 @@ func GetSkuSaleStatusName(status int) string {
 	return model.SkuStatusName[status]
 }
 
+func GetBoolName(flag bool) string {
+	if flag {
+		return "是"
+	} else {
+		return "否"
+	}
+}
+
+func IsSkuCanSale(saleStatus int) bool {
+	return saleStatus == model.SkuStatusNormal
+}
+
 func CompareJxAndVendor(vendorID int, storeIDStr, vendorStoreID, storeName string, filterJxSkuInfoMap map[int]*StoreSkuNameExt, filterVendorSkuInfoMap map[int]*partner.SkuNameInfo) {
 	for skuID, jxSkuInfo := range filterJxSkuInfoMap {
 		skuIDStr := utils.Int2Str(skuID)
@@ -182,23 +194,14 @@ func CompareJxAndVendor(vendorID int, storeIDStr, vendorStoreID, storeName strin
 			status = jxSkuInfo.Skus2[0].JdSyncStatus
 		}
 		syncStatus := utils.Int2Str(int(status))
-		toBeCreate := "否"
-		if model.IsSyncStatusNeedCreate(status) {
-			toBeCreate = "是"
-		}
-		toBeDel := "否"
-		if model.IsSyncStatusNeedDelete(status) {
-			toBeDel = "是"
-		}
+		toBeCreate := GetBoolName(model.IsSyncStatusNeedCreate(status))
+		toBeDel := GetBoolName(model.IsSyncStatusNeedDelete(status))
 		
 		if vendorSkuInfo != nil {
 			vendorSkuDetailName := vendorSkuInfo.SkuList[0].SkuName
 			vendorSkuSaleStatusName := GetSkuSaleStatusName(vendorSkuInfo.SkuList[0].Status)
 
 			isSaleStatusDiff := jxSkuSaleStatusName != vendorSkuSaleStatusName
-			if isFilterToBeCreateAndNotSale && model.IsSyncStatusNeedCreate(status) && jxSkuSaleStatus != model.SkuStatusNormal {
-				continue
-			}
 			isNameDiff := jxSkuDetailName != vendorSkuDetailName
 			if jxSkuDetailName != "" && vendorSkuDetailName != "" && strings.Contains(jxSkuDetailName, vendorSkuDetailName) {
 				isNameDiff = false
@@ -208,6 +211,9 @@ func CompareJxAndVendor(vendorID int, storeIDStr, vendorStoreID, storeName strin
 				diffData.AppendData(vendorID, outPutData)
 			}
 		} else {
+			if isFilterToBeCreateAndNotSale && model.IsSyncStatusNeedCreate(status) && !IsSkuCanSale(jxSkuSaleStatus) {
+				continue
+			}
 			outPutData := DiffData{storeIDStr, vendorStoreID, storeName, skuIDStr, syncStatus, toBeCreate, toBeDel, jxSkuDetailName, "", jxSkuSaleStatusName, ""}
 			diffData.AppendData(vendorID, outPutData)
 		}