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