From 96bb72f87a76809c4e0b716f1ff978c327cec77a Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 18 Sep 2019 08:23:40 +0800 Subject: [PATCH] - dao.GetSkusCategories --- business/model/dao/store_sku.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index c90b7f118..78e31a26f 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -129,7 +129,7 @@ func GetSkusCategories(db *DaoDB, vendorID, storeID int, skuIDs []int, level int LEFT JOIN store_sku_category_map t5 ON t4.id = t5.category_id AND t5.store_id = t1.store_id AND t5.deleted_at = ? LEFT JOIN sku_category t4p ON t4.parent_id = t4p.id LEFT JOIN store_sku_category_map t5p ON t4p.id = t5p.category_id AND t5p.store_id = t1.store_id AND t5p.deleted_at = ? - WHERE t1.deleted_at = ? AND t1.store_id = ? AND ((t1.status = ? AND t2.status = ? AND t3.status = ?) OR (t1.%s_sync_status & ? = 0)) + WHERE t1.deleted_at = ? AND t1.%s_sync_status & ? = 0 AND t1.store_id = ? AND ((t1.status = ? AND t2.status = ? AND t3.status = ?) OR (t1.%s_sync_status & ? = 0)) ` sqlParams := []interface{}{ utils.DefaultTimeValue, @@ -138,18 +138,19 @@ func GetSkusCategories(db *DaoDB, vendorID, storeID int, skuIDs []int, level int utils.DefaultTimeValue, utils.DefaultTimeValue, utils.DefaultTimeValue, + model.SyncFlagDeletedMask, storeID, model.SkuStatusNormal, model.SkuStatusNormal, model.SkuStatusNormal, - model.SyncFlagNewMask | model.SyncFlagDeletedMask, + model.SyncFlagNewMask, } if len(skuIDs) > 0 { sql += " AND t1.sku_id IN (" + GenQuestionMarks(len(skuIDs)) + ")" sqlParams = append(sqlParams, skuIDs) } fieldPrefix := ConvertDBFieldPrefix(model.VendorNames[vendorID]) - sql = fmt.Sprintf(sql, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix) + sql = fmt.Sprintf(sql, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix) if err = GetRows(db, &cats, sql, sqlParams...); err != nil { return nil, err }