mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整商品列表查询

Browse Source
This commit is contained in:
luofei 2024-01-22 16:42:18 +08:00
parent e39c96e65c
commit 1af1b7570b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/controller/api/store/product/CloudWarehouse.php
View File

@ -47,10 +47,12 @@ class CloudWarehouse extends BaseController
public function index($street_code, $page = 1, $category_id = 0, $cate_pid = 0,$cate_id = 0,$location = '') public function index($street_code, $page = 1, $category_id = 0, $cate_pid = 0,$cate_id = 0,$location = '')
{ {
$query = Db::name('cloud_product')->where('status', 1); $query = Db::name('cloud_product')->where('status', 1);
if (!empty($location)) { if (!empty($location) && $location != ',') {
[$lat, $lng] = explode(',', $location); [$lat, $lng] = explode(',', $location);
} }
if (!empty($street_code) && empty($location)) { if (!empty($street_code) && (empty($location) || $location == ',')) {
$location = GeoStreet::where('street_code', $street_code)->field('lng,lat')->find(); $location = GeoStreet::where('street_code', $street_code)->field('lng,lat')->find();
if (!empty($location)) { if (!empty($location)) {
[$lat, $lng] = [$location['lat'], $location['lng']]; [$lat, $lng] = [$location['lat'], $location['lng']];
@ -62,8 +64,8 @@ class CloudWarehouse extends BaseController
$query->whereIn('mer_id', $merIds); $query->whereIn('mer_id', $merIds);
} }
} }
if (empty($merIds)) { if (empty($merIds) && !empty($lat)) {
$merIds = (new MerchantDao())->getValidMerchantByDistance($location['lat'], $location['lng'], true); $merIds = (new MerchantDao())->getValidMerchantByDistance($lat, $lng, true);
$query->whereIn('mer_id', $merIds); $query->whereIn('mer_id', $merIds);
} }
if($cate_pid!=0){ if($cate_pid!=0){