From 8d20e7a3efc3acf226d81bfddf783913d1e9cab1 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Thu, 6 Jun 2019 15:37:47 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E9=80=9A=E8=BF=87=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=A0=87=E8=AF=86=E8=8E=B7=E5=8F=96=E9=97=A8=E5=BA=97=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E4=BF=A1=E6=81=AF=E6=97=B6=EF=BC=8C=E5=8F=AA=E9=92=88?=
 =?UTF-8?q?=E5=AF=B9=E5=B7=B2=E5=88=9B=E5=BB=BA=E5=A5=BD=EF=BC=8C=E4=B8=94?=
 =?UTF-8?q?=E6=9C=AA=E5=88=A0=E9=99=A4=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.go | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 9521ede9c..8e9644b8f 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -222,16 +222,16 @@ func GetStoresSkus(ctx *jxcontext.Context, storeIDs []int, isFocus bool, keyword
 			}
 			sql += " AND ( 1 = 0"
 			if params["jdSyncStatus"] != nil && realVendorMap[model.VendorIDJD] == 1 {
-				sql += " OR t4.jd_sync_status & ? <> 0"
-				sqlParams = append(sqlParams, params["jdSyncStatus"])
+				sql += " OR (t4.jd_sync_status & ? <> 0 AND t4.jd_sync_status & ? = 0)"
+				sqlParams = append(sqlParams, params["jdSyncStatus"], model.SyncFlagDeletedMask|model.SyncFlagNewMask)
 			}
 			if params["ebaiSyncStatus"] != nil && realVendorMap[model.VendorIDEBAI] == 1 {
-				sql += " OR t4.ebai_sync_status & ? <> 0"
-				sqlParams = append(sqlParams, params["ebaiSyncStatus"])
+				sql += " OR (t4.ebai_sync_status & ? <> 0 AND t4.ebai_sync_status & ? = 0)"
+				sqlParams = append(sqlParams, params["ebaiSyncStatus"], model.SyncFlagDeletedMask|model.SyncFlagNewMask)
 			}
 			if params["mtwmSyncStatus"] != nil && realVendorMap[model.VendorIDMTWM] == 1 {
-				sql += " OR t4.mtwm_sync_status & ? <> 0"
-				sqlParams = append(sqlParams, params["mtwmSyncStatus"])
+				sql += " OR (t4.mtwm_sync_status & ? <> 0 AND t4.mtwm_sync_status & ? = 0)"
+				sqlParams = append(sqlParams, params["mtwmSyncStatus"], model.SyncFlagDeletedMask|model.SyncFlagNewMask)
 			}
 			sql += ")"
 		}
@@ -468,8 +468,9 @@ func GetStoreAbnormalSkuCount(ctx *jxcontext.Context, storeID, syncStatus int, i
 	}
 	for _, vendorID := range []int{model.VendorIDJD, model.VendorIDEBAI, model.VendorIDMTWM} {
 		if realVendorMap[vendorID] != 0 {
-			sql += fmt.Sprintf(" OR t1.%s_sync_status & ? <> 0", dao.ConvertDBFieldPrefix(model.VendorNames[vendorID]))
-			sqlParams = append(sqlParams, syncStatus)
+			prefix := dao.ConvertDBFieldPrefix(model.VendorNames[vendorID])
+			sql += fmt.Sprintf(" OR (t1.%s_sync_status & ? <> 0 AND t1.%s_sync_status & ? = 0)", prefix, prefix)
+			sqlParams = append(sqlParams, syncStatus, model.SyncFlagDeletedMask|model.SyncFlagNewMask)
 		}
 	}
 	sql += ")"