update 自提点列表支持按经纬度距离排序

application/services/marketing/TakePlaceService.php

@@ -7,6 +7,7 @@ use Api\PhpUtils\Http\Request;
 use App\Models\marketing\mysql\MarketingTakePlace;
 use App\Models\marketing\mysql\TakePlace;
 use App\Exception\custom\MarketingException;
+use Api\PhpUtils\Common\Geo;
 
 class TakePlaceService
 {
@@ -113,6 +114,8 @@ class TakePlaceService
     {
         $marketingId = $params['marketing_id'];
         $keywords = $params['keywords'] ?? '';
+        $longitude = $params['longitude'] ?? '';
+        $latitude = $params['latitude'] ?? '';
         $page = $params['page'] ?? 1;
         $limit = $params['limit'] ?? 20;
 
@@ -139,7 +142,8 @@ class TakePlaceService
         //获取自提点信息
         $makePlaceIds = array_column($relations,'take_place_id');
         $takePlaceWhere = ['take_place_id'=>$makePlaceIds];
-        $res['list'] = TakePlace::select('*', $takePlaceWhere);
+        //本页按距离返回列表
+        $res['list'] = self::sortByDistance($latitude,$longitude,TakePlace::select('*', $takePlaceWhere));
         unset($where['ORDER'],$where['LIMIT']);
         $res['total'] = MarketingTakePlace::count('*', $where);
         $res['total_page'] = ceil($res['total']/$limit);
@@ -147,4 +151,32 @@ class TakePlaceService
         return $res;
     }
 
+    /**
+     * 根据经纬度按距离排序
+     * @param $lat
+     * @param $lng
+     * @param $list
+     * @return array
+     */
+    private static function sortByDistance($lat, $lng, $list)
+    {
+        //未传经纬度
+        if(empty($lat) || empty($lng)) {
+            return $list;
+        }
+        //按距离返回自提点列表
+        if(!empty($list) && is_array($list)) {
+            foreach ($list as &$item) {
+                if($item['longitude'] && $item['latitude']) {
+                    $item['distance'] = Geo::geoDistance($lat,$lng,$item['longitude'],$item['latitude'],true);
+                }else {
+                    $item['distance'] = '';
+                }
+            }
+            unset($item);
+
+            return $list;
+        }
+    }
+
 }
\ No newline at end of file