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 += ")"