From 74ac1da5f3f2196edd31e77049eb99b3230d4cda Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Wed, 23 Sep 2020 10:04:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=80=81=E8=B4=B9=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=8B=BC=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/v3/OrderOnlineController.php           | 11 +++++++++--
 app/Service/v3/Implementations/UserAddressService.php |  6 ++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/Controller/v3/OrderOnlineController.php b/app/Controller/v3/OrderOnlineController.php
index b89558a..15865f0 100644
--- a/app/Controller/v3/OrderOnlineController.php
+++ b/app/Controller/v3/OrderOnlineController.php
@@ -108,19 +108,26 @@ class OrderOnlineController extends BaseController
         }
         $deliveryDistance = config('distance.delivery_distance');
         if(isset($distance) && $distance < $deliveryDistance){
+            if($distance >= 1000){
+                $distance_text = '距离' . bcdiv($distance,1000,2) . ' km';
+            }else{
+                $distance_text = '距离' . $distance . ' m';
+            }
             $distributionPrice = $this->distributionPriceService->do($distance);
             $res['location'] = [
                 'address' => $address,
                 'distribution_price' => $distributionPrice,
                 'distance' => $distance,
-                'within' => true
+                'within' => true,
+                'distribution_text' => '¥ '.$distributionPrice .'(' .$distance_text .')'
             ];
         }else{
             $res['location'] = [
                 'address' => '',
                 'distribution_price' => 3.5,
                 'distance' => $distance,
-                'within' => false
+                'within' => false,
+                'distribution_text' => ''
             ];
         }
         //返回预约送达时间 数组
diff --git a/app/Service/v3/Implementations/UserAddressService.php b/app/Service/v3/Implementations/UserAddressService.php
index 646d95f..60fe819 100644
--- a/app/Service/v3/Implementations/UserAddressService.php
+++ b/app/Service/v3/Implementations/UserAddressService.php
@@ -98,9 +98,15 @@ 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';
+        }else{
+            $distance_text = '距离' . $distance . ' m';
+        }
         $res['address'] = $address;
         $res['delivery_distance'] = $distance;
         $res['distribution_price'] = $distributionPrice;
+        $res['distribution_text'] = '¥ '.$distributionPrice .'(' .$distance_text .')';
         return $res;
     }