|
|
@@ -147,11 +147,9 @@ func GetLatest(page, perPage, recommend, priceSort, saleSort int64, ptype string
|
|
|
saleSql = "-created_at"
|
|
|
priceSql = "-recommend"
|
|
|
}
|
|
|
- sortSql := fmt.Sprintf("%s,%s", priceSql, saleSql)
|
|
|
o := orm.NewOrm()
|
|
|
- _, err := o.QueryTable(new(Product)).Filter("status", 1).
|
|
|
- Filter("recommend__gt", recommend).Filter("show_flag", true).Filter("ptype", ptype).
|
|
|
- OrderBy(sortSql).
|
|
|
+ _, err := o.QueryTable(new(Product)).Filter("status", 1).Filter("recommend__gt", recommend).Filter("show_flag", true).Filter("ptype", ptype).
|
|
|
+ OrderBy(saleSql).OrderBy(priceSql).
|
|
|
Limit(perPage, (page-1)*perPage).
|
|
|
All(&products)
|
|
|
if err != nil {
|
|
|
@@ -228,7 +226,6 @@ func GetProductsByCatId(cId, page, perPage, priceSort, saleSort int64, words str
|
|
|
saleSql = "-created_at"
|
|
|
priceSql = "-recommend"
|
|
|
}
|
|
|
- sortSql := fmt.Sprintf("%s,%s", priceSql, saleSql)
|
|
|
|
|
|
o := orm.NewOrm()
|
|
|
qs := o.QueryTable(new(Product)).Filter("status", 1).Filter("show_flag", true).Filter("ptype", TYPE_DIRECT_SALE)
|
|
|
@@ -239,7 +236,7 @@ func GetProductsByCatId(cId, page, perPage, priceSort, saleSort int64, words str
|
|
|
qs = qs.Filter("key_words__icontains", words)
|
|
|
}
|
|
|
_, err := qs.
|
|
|
- OrderBy(sortSql).
|
|
|
+ OrderBy(saleSql).OrderBy(priceSql).
|
|
|
Limit(perPage, (page-1)*perPage).
|
|
|
All(&products)
|
|
|
if err != nil {
|