Browse Source

增加距离

duqinya 6 years ago
parent
commit
a42c221364

+ 5 - 0
app/Http/Controllers/ConfigPickupNodeController.php

@@ -5,6 +5,7 @@ use App\Repositories\ConfigPickupNodeRepository;
 use App\Transformers\PickupNodeTransformer;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use JeroenDesloovere\Distance\Distance;
 use League\Fractal\Resource\Collection;
 use League\Fractal\Manager;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
@@ -27,6 +28,7 @@ class ConfigPickupNodeController extends BaseController
     {
         //自提点列表
         $configPickupNode = $this->configPickupNodeRepository->index($request->all());
+
         if (count($configPickupNode)>0) {
 
             foreach ($configPickupNode as $k => $v) {
@@ -36,6 +38,9 @@ class ConfigPickupNodeController extends BaseController
 
                 $configPickupNode[$k]->store_ids = $v->getStoreNameAttribute();//储存方式名称
                 $configPickupNode[$k]->pickup_group_id = $v->getGroupNameAttribute();//自提点分组名称
+                $configPickupNode[$k]->distance = Distance::between(
+                    $request['latitude'], $request['longitude'], $v->latitude, $v->longitude
+                );
             }
         }
 

+ 1 - 1
app/Transformers/PickupNodeTransformer.php

@@ -25,7 +25,7 @@ class PickupNodeTransformer extends TransformerAbstract
             'store_ids' => $ConfigPickupNode['store_ids'],
             'pickup_group_id' => $ConfigPickupNode['pickup_group_id'],
             'status' => $ConfigPickupNode['status'],
-            'distance' => $ConfigPickupNode['distance'],
+            'distance' => $ConfigPickupNode['distance'].'km',
         ];
 
     }

+ 1 - 1
database/migrations/2019_04_25_143536_add_bjcity_id_config_province_table.php

@@ -15,7 +15,7 @@ class AddBjcityIdConfigProvinceTable extends Migration
     {
         Schema::table('config_province', function (Blueprint $table) {
             $table->renameColumn('name', 'area_name');
-            $table->renameColumn('id', 'bjcity_id',20)->comment('地区id');
+            $table->renameColumn('id', 'bjcity_id',20)->comment('百度城市id');
             $table->string('area_code',50)->nullable()->comment('地区编码');
             $table->string('city_code',50)->comment('城市编码');
             $table->string('center',50)->comment('城市中心点(即:经纬度坐标)');