订单确认

app/Controller/v3/OrderOnlineController.php

@@ -103,8 +103,11 @@ class OrderOnlineController extends BaseController
             ->orderByDesc('updated_at')
             ->first();
         $market = Market::find($marketId);
-        $distance = $this->locationService->getDistanceByTencent($address->lng,$address->lat,$market->lng,$market->lat);
-        if($distance < 8000){
+        if(!empty($address->lng) && !empty($address->lat)){
+            $distance = $this->locationService->getDistanceByTencent($market->lng,$market->lat,$address->lng,$address->lat);
+        }
+
+        if(isset($distance) && $distance > 8000){
             $distributionPrice = $this->distributionPriceService->do($distance);
             $res['location'] = [
                 'address' => $address,

app/Service/v3/Implementations/LocationService.php

@@ -162,7 +162,6 @@ class LocationService implements LocationServiceInterface
         {
             throw new ErrorCodeException(ErrorCode::LOCATION_ERROR,$resultArr['message']);
         }
-        var_dump($resultArr);
         $distance = $resultArr['result']['rows'][0]['elements'][0]['distance'];
         return $distance;
     }

app/Service/v3/Implementations/UserAddressService.php

@@ -87,7 +87,6 @@ class UserAddressService implements UserAddressServiceInterface
         $market = Market::query()->select('lng','lat')->find($marketId);
         $distance = $this->locationService->getDistanceByTencent($address['address']->lng,$address['address']->lat,$market->lng,$market->lat);
         $distributionPrice = $this->distributionPriceService->do($distance);
-        var_dump($distance);
         $res['address'] = $address;
         $res['delivery_distance'] = $distance;
         $res['distribution_price'] = $distributionPrice;