diff --git a/app/api/logic/LocalStoreLogic.php b/app/api/logic/LocalStoreLogic.php index 5743023b..01b10dfa 100644 --- a/app/api/logic/LocalStoreLogic.php +++ b/app/api/logic/LocalStoreLogic.php @@ -14,13 +14,13 @@ class LocalStoreLogic extends Logic $s = ""; if(isset($data['c_name'])){ if($data['c_name']!=""){ - $s = "address like '%".$data['c_name']."%'"; + $s = "and address like '%".$data['c_name']."%'"; } } -// $count = $model->where('is_delete',0) -// ->where($s) -// ->count(); + $count = $model->where('is_delete',0) + ->where($s) + ->count(); // $lists = $model->where('is_delete',0) // ->where($s) // ->page($data['page'], $data['size']) @@ -30,7 +30,7 @@ class LocalStoreLogic extends Logic $sql = "SELECT *, ST_Distance_Sphere(POINT(".$data['longitude'].",".$data['latitude']."),POINT(longitude, latitude)) AS distance FROM ls_local_store where is_delete = 0 $s ORDER BY distance limit '".$page."','".$data['page_size']."'"; - var_dump($sql); +// var_dump($sql); $lists = Db::query($sql); foreach($lists as $key=>$value){ $lists[$key]['distance'] = $this->distance($data['latitude'], $data['longitude'], $value['latitude'], $value['longitude']);