From 0c498e152f9cb9815b714d8f702a0e93123f62b5 Mon Sep 17 00:00:00 2001 From: gazebo Date: Sun, 16 Jun 2019 12:32:12 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E5=AF=B9=E4=BA=8E=E4=BA=AC=E4=B8=9C?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=EF=BC=8Csku=E6=88=96skuName=E4=B8=8D?= =?UTF-8?q?=E5=8F=AF=E5=94=AE=E7=9A=84=EF=BC=8C=E4=B8=8D=E7=AE=97=E5=9C=A8?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=A8=E5=BA=97=E5=95=86=E5=93=81=E5=86=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store_sku.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 1e7525aca..f9d837d4d 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -229,8 +229,8 @@ 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 AND t4.jd_sync_status & ? = 0 AND t2.jd_id <> 0)" - sqlParams = append(sqlParams, params["jdSyncStatus"], model.SyncFlagDeletedMask|model.SyncFlagNewMask) + sql += " OR (t4.jd_sync_status & ? <> 0 AND t4.jd_sync_status & ? = 0 AND t2.jd_id <> 0 AND t1.status = ? AND t2.status = ?)" + sqlParams = append(sqlParams, params["jdSyncStatus"], model.SyncFlagDeletedMask|model.SyncFlagNewMask, model.SkuStatusNormal, model.SkuStatusNormal) } if params["ebaiSyncStatus"] != nil && realVendorMap[model.VendorIDEBAI] == 1 { sql += " OR (t4.ebai_sync_status & ? <> 0 AND t4.ebai_sync_status & ? = 0)" @@ -477,11 +477,12 @@ func GetStoreAbnormalSkuCount(ctx *jxcontext.Context, storeID, syncStatus int, i if realVendorMap[vendorID] != 0 { 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) if model.MultiStoresVendorMap[vendorID] == 1 { - sql += fmt.Sprintf(" AND t2.%s_id <> 0", prefix) + sql += fmt.Sprintf(" AND t2.%s_id <> 0 AND t2.status = ? AND t3.status = ?", prefix) + sqlParams = append(sqlParams, model.SkuStatusNormal, model.SkuStatusNormal) } sql += ")" - sqlParams = append(sqlParams, syncStatus, model.SyncFlagDeletedMask|model.SyncFlagNewMask) } } sql += ")"