diff --git a/business/model/dao/sku.go b/business/model/dao/sku.go index 33c8f238b..03e0006c0 100644 --- a/business/model/dao/sku.go +++ b/business/model/dao/sku.go @@ -125,27 +125,8 @@ func GetSkuNames(db *DaoDB, nameIDs []int) (skuNameList []*model.SkuName, err er return nil, err } -func GetSkuByNames(db *DaoDB, nameIDs []int) (skuList []*model.Sku, err error) { - sql := ` - SELECT * - FROM sku t1 - WHERE t1.deleted_at = ? - ` - sqlParams := []interface{}{ - utils.DefaultTimeValue, - } - if len(nameIDs) > 0 { - sql += " AND t1.name_id IN (" + GenQuestionMarks(len(nameIDs)) + ")" - sqlParams = append(sqlParams, nameIDs) - } - if err = GetRows(db, &skuList, sql, sqlParams...); err == nil { - return skuList, nil - } - return nil, err -} - func GetSkuIDByNames(db *DaoDB, nameIDs []int) (skuIDs []int, err error) { - skuList, err := GetSkuByNames(db, nameIDs) + skuList, err := GetSkus(db, nil, nameIDs, nil, nil) if err == nil { for _, sku := range skuList { skuIDs = append(skuIDs, sku.ID) @@ -155,21 +136,12 @@ func GetSkuIDByNames(db *DaoDB, nameIDs []int) (skuIDs []int, err error) { } func GetSkuByCats(db *DaoDB, catIDs []int) (skuList []*model.Sku, err error) { - sql := ` - SELECT t1.* - FROM sku t1 - JOIN sku_name t2 ON t2.id = t1.name_id AND t2.deleted_at = ? - WHERE t1.deleted_at = ?` - sqlParams := []interface{}{ - utils.DefaultTimeValue, - utils.DefaultTimeValue, + skuExList, err := GetSkus(db, nil, nil, nil, catIDs) + if err == nil { + for _, v := range skuExList { + skuList = append(skuList, &v.Sku) + } } - if len(catIDs) > 0 { - sql += " AND t2.category_id IN (" + GenQuestionMarks(len(catIDs)) + ")" - sqlParams = append(sqlParams, catIDs) - } - err = GetRows(db, &skuList, sql, sqlParams...) - // globals.SugarLogger.Debugf("GetSkuByCats err:%v", err) return skuList, err }