From d0e87bcb002d54beb7a6bc8ff68b104638447a0c Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 30 Jan 2024 18:28:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/dao/store/product/SpuDao.php | 2 +- .../store/product/SpuRepository.php | 7 ++--- app/controller/api/store/product/StoreSpu.php | 29 +++++++++++++------ 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/app/common/dao/store/product/SpuDao.php b/app/common/dao/store/product/SpuDao.php index 1c885742..040e29bb 100755 --- a/app/common/dao/store/product/SpuDao.php +++ b/app/common/dao/store/product/SpuDao.php @@ -70,7 +70,7 @@ class SpuDao extends BaseDao ->when(isset($where['mer_array_id']),function($query)use($where){ $query->whereIn('P.mer_id',$where['mer_array_id']); }) - ->when(isset($where['mer_ids']) && $where['mer_ids'] !== '',function($query)use($where){ + ->when(isset($where['mer_ids']) && count($where['mer_ids'])>0,function($query)use($where){ $query->whereIn('P.mer_id',$where['mer_ids']); }) ->when(isset($where['keyword']) && $where['keyword'] !== '',function($query)use($where){ diff --git a/app/common/repositories/store/product/SpuRepository.php b/app/common/repositories/store/product/SpuRepository.php index ae6dbc68..993e7a79 100755 --- a/app/common/repositories/store/product/SpuRepository.php +++ b/app/common/repositories/store/product/SpuRepository.php @@ -164,8 +164,7 @@ class SpuRepository extends BaseRepository 'product.attrValue', ]); $productMake = app()->make(ProductRepository::class); - $count = $query->fetchSql(false)->count(); - + $count = $query->count(); if ($limit == 0) { $list = $query->setOption('field', [])->field($this->productFiled)->select() ->each(function ($item) use ($is_sku, $productMake, $userInfo,$where) { @@ -179,7 +178,7 @@ class SpuRepository extends BaseRepository $item['merchant']['village_name']=$village_name.'集体经营合作店铺'; } } - if (isset($item['merchant']['lat'] , $item['merchant']['long']) && isset($where['lat'], $where['long'])) { + if (isset($item['merchant']['lat'] , $item['merchant']['long']) && isset($where['lat'], $where['long'])&&$where['lat']!='') { $distance = getDistance($where['lat'], $where['long'], $item['merchant']['lat'], $item['merchant']['long']); if ($distance < 0.9) { $distance = max(bcmul($distance, 1000, 0), 1).'m'; @@ -205,7 +204,7 @@ class SpuRepository extends BaseRepository $item['merchant']['village_name']=$village_name.'集体经营合作店铺'; } } - if (isset($item['merchant']['lat'] , $item['merchant']['long']) && isset($where['lat'], $where['long'])) { + if (isset($item['merchant']['lat'] , $item['merchant']['long']) && isset($where['lat'], $where['long'])&&$where['lat']!='') { $distance = getDistance($where['lat'], $where['long'], $item['merchant']['lat'], $item['merchant']['long']); if ($distance < 0.9) { $distance = max(bcmul($distance, 1000, 0), 1).'m'; diff --git a/app/controller/api/store/product/StoreSpu.php b/app/controller/api/store/product/StoreSpu.php index dce7c908..1cdd3481 100755 --- a/app/controller/api/store/product/StoreSpu.php +++ b/app/controller/api/store/product/StoreSpu.php @@ -66,10 +66,15 @@ class StoreSpu extends BaseController 'village_id', 'location' ]); - [$lat, $lng] = (new CityAreaDao())->getLngAndLat($where['location'], $where['street_id']); - $where['long']=$lng; - $where['lat']=$lat; - if ($where['type_id']||$where['type_code']) { + if (isset($where['type_code']) && $where['type_code'] == 'PersonalStore') { + $where['long'] = ''; + $where['lat'] = ''; + } else { + [$lat, $lng] = (new CityAreaDao())->getLngAndLat($where['location'], $where['street_id']); + $where['long'] = $lng; + $where['lat'] = $lat; + } + if ($where['type_id'] || $where['type_code']) { $arr = ['status' => 1, 'mer_state' => 1, 'is_del' => 0]; $query = Merchant::where($arr); // $merIds = (new MerchantDao())->getValidMerchantByDistance($lat, $lng); @@ -85,17 +90,23 @@ class StoreSpu extends BaseController // $query->where('type_id', $mer_type_id); // } // } - $where['mer_ids'] = $query->whereIn('type_id', explode(',', $where['type_id']))->column('mer_id'); + $mer_type_id = Db::name('merchant_type')->where('type_code', $where['type_code'])->value('mer_type_id'); + if ($mer_type_id && $where['type_code'] == 'PersonalStore') { + $where['mer_ids'] = $query->where('type_id', $mer_type_id)->column('mer_id'); + }else{ + $where['mer_ids'] = $query->whereIn('type_id', explode(',', $where['type_id']))->column('mer_id'); + + } } - unset($where['type_id'], $where['street_id'],$where['type_code'],$where['village_id']); + unset($where['type_id'], $where['street_id'], $where['type_code'], $where['village_id']); $where['is_gift_bag'] = 0; $where['product_type'] = $where['product_type'] != '' ? $where['product_type'] : 0; $where['order'] = $where['order'] ?: 'star'; if ($where['is_trader'] != 1) unset($where['is_trader']); - if($where['category_id']!=''){ - $where['mer_ids']= Db::name('merchant')->where(['category_id'=>$where['category_id'],'status'=>1,'is_del'=>0])->column('mer_id'); + if ($where['category_id'] != '') { + $where['mer_ids'] = Db::name('merchant')->where(['category_id' => $where['category_id'], 'status' => 1, 'is_del' => 0])->column('mer_id'); } $data = $this->repository->getApiSearch($where, $page, $limit, $this->userInfo); return app('json')->success($data); @@ -155,7 +166,7 @@ class StoreSpu extends BaseController $where['mer_id'] = $id; $where['is_gift_bag'] = 0; $where['order'] = $where['order'] ? $where['order'] : 'sort'; - $data = $this->repository->getApiSearch($where, $page, $limit, $this->userInfo,true); + $data = $this->repository->getApiSearch($where, $page, $limit, $this->userInfo, true); return app('json')->success($data); }