This commit is contained in:
彭桃 2023-02-28 10:02:00 +08:00
parent 9abac14802
commit 6cb8a607fe
2 changed files with 4 additions and 2 deletions

View File

@ -29,7 +29,7 @@ class SpuDao extends BaseDao
{
$order = 'P.sort DESC';
if(isset($where['order'])){
if(in_array($where['order'], ['is_new', 'price_asc', 'price_desc', 'rate', 'sales'])){
if(in_array($where['order'], ['is_new', 'price_asc', 'price_desc', 'rate', 'sales','is_benefit'])){
if ($where['order'] == 'price_asc') {
$order = 'S.price ASC';
} else if ($where['order'] == 'price_desc') {

View File

@ -96,7 +96,9 @@ class MerchantDao extends BaseDao
$query->when($order, function ($query) use ($where, $order) {
if ($order == 'rate') {
$query->order('is_best DESC, product_score DESC,service_score DESC,postage_score DESC');
} else if ($order == 'location' && isset($where['location']['long'], $where['location']['lat'])) {
} else if ($order == 'sales'){
$query->order('sales DESC,is_best DESC,sort DESC');
}else if ($order == 'location' && isset($where['location']['long'], $where['location']['lat'])) {
$lng = (float)$where['location']['long'];
$lat = (float)$where['location']['lat'];
$query->whereNotNull('lat')->whereNotNull('long')