From 16058304bb84b53aaa33e53b91361912c26f71d0 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Wed, 24 Jan 2024 10:17:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/dao/store/product/SpuDao.php | 18 ++++++++- .../store/product/SpuRepository.php | 37 +++++++++++++++++-- app/controller/api/Demo.php | 4 ++ app/controller/api/store/product/StoreSpu.php | 30 ++++++++------- 4 files changed, 70 insertions(+), 19 deletions(-) diff --git a/app/common/dao/store/product/SpuDao.php b/app/common/dao/store/product/SpuDao.php index 0ff7eda5..1c885742 100644 --- a/app/common/dao/store/product/SpuDao.php +++ b/app/common/dao/store/product/SpuDao.php @@ -17,6 +17,7 @@ use app\common\model\store\StoreCategory; use app\common\repositories\store\StoreCategoryRepository; use app\common\repositories\system\merchant\MerchantRepository; use crmeb\services\VicWordService; +use think\facade\Db; class SpuDao extends BaseDao { @@ -188,9 +189,22 @@ class SpuDao extends BaseDao }) ->when(isset($where['svip']) && $where['svip'] !== '',function($query)use($where){ $query->where('svip_price_type','>',0)->where('mer_svip_status',1); + })->when($order, function ($query) use ($where, $order) { + if(isset($where['long'])&&$where['long']!='' &&isset($where['lat'])&&$where['lat']!=''){ + $lng=$where['long']; + $lat=$where['lat']; + $query->whereNotNull('lat')->whereNotNull('long') + ->order(Db::raw("(2 * 6378.137 * ASIN( + SQRT( + POW( SIN( PI( ) * ( $lng- `long` ) / 360 ), 2 ) + COS( PI( ) * $lat / 180 ) * COS( `lat` * PI( ) / 180 ) * POW( SIN( PI( ) * ( $lat- `lat` ) / 360 ), 2 ) + ) + ) + ) ASC ")); + }else{ + $query->orderRaw($order); + } }); - - return $query->orderRaw($order); + return $query; } public function findOrCreateAll(array $where) diff --git a/app/common/repositories/store/product/SpuRepository.php b/app/common/repositories/store/product/SpuRepository.php index a360d174..ae6dbc68 100644 --- a/app/common/repositories/store/product/SpuRepository.php +++ b/app/common/repositories/store/product/SpuRepository.php @@ -97,7 +97,14 @@ class SpuRepository extends BaseRepository 'sort' => $param['sort'] ?? 0, 'mer_labels' => $param['mer_labels'] ?? '', ]; - if (isset($param['mer_id'])) $data['mer_id'] = $param['mer_id']; + if (isset($param['mer_id'])){ + $data['mer_id'] = $param['mer_id']; + $find=Db::name('merchant')->where('mer_id',$param['mer_id'])->find(); + if($find){ + $data['long']=$find['long']; + $data['lat']=$find['lat']; + } + } return $data; } @@ -161,7 +168,7 @@ class SpuRepository extends BaseRepository if ($limit == 0) { $list = $query->setOption('field', [])->field($this->productFiled)->select() - ->each(function ($item) use ($is_sku, $productMake, $userInfo) { + ->each(function ($item) use ($is_sku, $productMake, $userInfo,$where) { if ($is_sku == true) { $sku = $productMake->detailAttrValue($item['product']['attrValue'], $userInfo); $item['sku'] = $sku; @@ -172,10 +179,22 @@ class SpuRepository extends BaseRepository $item['merchant']['village_name']=$village_name.'集体经营合作店铺'; } } + if (isset($item['merchant']['lat'] , $item['merchant']['long']) && isset($where['lat'], $where['long'])) { + $distance = getDistance($where['lat'], $where['long'], $item['merchant']['lat'], $item['merchant']['long']); + if ($distance < 0.9) { + $distance = max(bcmul($distance, 1000, 0), 1).'m'; + if ($distance == '1m') { + $distance = '100m以内'; + } + } else { + $distance .= 'km'; + } + $item['distance'] = $distance; + } }); } else { $list = $query->page($page, $limit)->setOption('field', [])->field($this->productFiled)->select() - ->each(function ($item) use ($is_sku, $productMake, $userInfo) { + ->each(function ($item) use ($is_sku, $productMake, $userInfo,$where) { if ($is_sku == true) { $sku = $productMake->detailAttrValue($item['product']['attrValue'], $userInfo); $item['sku'] = $sku; @@ -186,6 +205,18 @@ class SpuRepository extends BaseRepository $item['merchant']['village_name']=$village_name.'集体经营合作店铺'; } } + if (isset($item['merchant']['lat'] , $item['merchant']['long']) && isset($where['lat'], $where['long'])) { + $distance = getDistance($where['lat'], $where['long'], $item['merchant']['lat'], $item['merchant']['long']); + if ($distance < 0.9) { + $distance = max(bcmul($distance, 1000, 0), 1).'m'; + if ($distance == '1m') { + $distance = '100m以内'; + } + } else { + $distance .= 'km'; + } + $item['distance'] = $distance; + } }); } diff --git a/app/controller/api/Demo.php b/app/controller/api/Demo.php index 68b95bae..f3517fe8 100644 --- a/app/controller/api/Demo.php +++ b/app/controller/api/Demo.php @@ -32,6 +32,10 @@ class Demo extends BaseController { public function index() { + $merchant = Db::name('merchant')->where('mer_id','>=',39)->where('long','<>','')->where('status',1)->select(); + foreach($merchant as $k=>$v){ + Db::name('store_spu')->where('mer_id',$v['mer_id'])->update(['long'=>$v['long'],'lat'=>$v['lat']]); + } return app('json')->success('修改成功'); //[31,32,118,39,167,236,237,238,239] // return app('json')->success('修改成功');>whereIn('mer_id',[110,116,149,227,226,35,117,148,156,104,137,151,136,183,140,229,79,133,235])-> diff --git a/app/controller/api/store/product/StoreSpu.php b/app/controller/api/store/product/StoreSpu.php index 22f1814c..a6423693 100644 --- a/app/controller/api/store/product/StoreSpu.php +++ b/app/controller/api/store/product/StoreSpu.php @@ -66,23 +66,25 @@ 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']) { - [$lat, $lng] = (new CityAreaDao())->getLngAndLat($where['location'], $where['street_id']); $arr = ['status' => 1, 'mer_state' => 1, 'is_del' => 0]; $query = Merchant::where($arr); - $merIds = (new MerchantDao())->getValidMerchantByDistance($lat, $lng); - if (!empty($merIds)) { - $query->whereIn('mer_id', $merIds); - } - if ($where['village_id']) { - $query->where('village_id', $where['village_id']); - } - if($where['type_code']){ - $mer_type_id=Db::name('merchant_type')->where('type_code',$where['type_code'])->value('mer_type_id'); - if($mer_type_id){ - $query->where('type_id', $mer_type_id); - } - } + // $merIds = (new MerchantDao())->getValidMerchantByDistance($lat, $lng); + // if (!empty($merIds)) { + // $query->whereIn('mer_id', $merIds); + // } + // if ($where['village_id']) { + // $query->where('village_id', $where['village_id']); + // } + // if($where['type_code']){ + // $mer_type_id=Db::name('merchant_type')->where('type_code',$where['type_code'])->value('mer_type_id'); + // if($mer_type_id){ + // $query->where('type_id', $mer_type_id); + // } + // } $where['mer_ids'] = $query->whereIn('type_id', explode(',', $where['type_id']))->column('mer_id'); }