Browse Source

配送费

master
Lemon 5 years ago
parent
commit
ab3b82c260
  1. 6
      app/Controller/v3/OrderOnlineController.php
  2. 6
      app/Service/v3/Implementations/UserAddressService.php

6
app/Controller/v3/OrderOnlineController.php

@ -109,9 +109,9 @@ class OrderOnlineController extends BaseController
$deliveryDistance = config('distance.delivery_distance'); $deliveryDistance = config('distance.delivery_distance');
if(isset($distance) && $distance < $deliveryDistance){ if(isset($distance) && $distance < $deliveryDistance){
if($distance >= 1000){ if($distance >= 1000){
$distance_text = '距' . bcdiv($distance,1000,2) . ' km';
$distance_text = '距 ' . bcdiv($distance,1000,2) . 'km';
}else{ }else{
$distance_text = '距' . $distance . ' m';
$distance_text = '距 ' . $distance . 'm';
} }
$distributionPrice = $this->distributionPriceService->do($distance); $distributionPrice = $this->distributionPriceService->do($distance);
$res['location'] = [ $res['location'] = [
@ -119,7 +119,7 @@ class OrderOnlineController extends BaseController
'distribution_price' => $distributionPrice, 'distribution_price' => $distributionPrice,
'distance' => $distance, 'distance' => $distance,
'within' => true, 'within' => true,
'distribution_text' => '¥ '.$distributionPrice .'(' .$distance_text .')'
'distribution_text' => '¥ '.$distributionPrice .'' .$distance_text .''
]; ];
}else{ }else{
$res['location'] = [ $res['location'] = [

6
app/Service/v3/Implementations/UserAddressService.php

@ -99,14 +99,14 @@ class UserAddressService implements UserAddressServiceInterface
$distance = $this->locationService->getDistanceByTencent($market->lng,$market->lat,$address['address']->lng,$address['address']->lat); $distance = $this->locationService->getDistanceByTencent($market->lng,$market->lat,$address['address']->lng,$address['address']->lat);
$distributionPrice = $this->distributionPriceService->do($distance); $distributionPrice = $this->distributionPriceService->do($distance);
if($distance >= 1000){ if($distance >= 1000){
$distance_text = '距' . bcdiv($distance,1000,2) . ' km';
$distance_text = '距 ' . bcdiv($distance,1000,2) . 'km';
}else{ }else{
$distance_text = '距' . $distance . ' m';
$distance_text = '距 ' . $distance . 'm';
} }
$res['address'] = $address; $res['address'] = $address;
$res['delivery_distance'] = $distance; $res['delivery_distance'] = $distance;
$res['distribution_price'] = $distributionPrice; $res['distribution_price'] = $distributionPrice;
$res['distribution_text'] = '¥ '.$distributionPrice .'(' .$distance_text .')';
$res['distribution_text'] = '¥ '.$distributionPrice .'' .$distance_text .'';
return $res; return $res;
} }

Loading…
Cancel
Save