From 44ea282d1c0ed3798eb90b06680c41be24b02ed2 Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Fri, 23 Oct 2020 15:10:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=80=81=E8=B4=B9=E6=97=A0=E5=87=8F?=
 =?UTF-8?q?=E5=85=8D=E6=97=B6=20=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/Controller/v3/OrderOnlineController.php b/app/Controller/v3/OrderOnlineController.php
index 83e7b07..c085e13 100644
--- a/app/Controller/v3/OrderOnlineController.php
+++ b/app/Controller/v3/OrderOnlineController.php
@@ -126,7 +126,7 @@ class OrderOnlineController extends BaseController
                 // 'distribution_text' => '¥ '.$distributionPrice .'（' .$distance_text .'）'
                 'distribution_text' => $distance_text,
                 'distribution_price_text' => '¥ '.$distributionPrice,
-                'original_price_text' => '¥ '.$originalPrice
+                'original_price_text' => $originalPrice > $distributionPrice ? '¥ '.$originalPrice : ''
             ];
         }else{
             $res['location'] = [
@@ -138,7 +138,7 @@ class OrderOnlineController extends BaseController
                 'style' => 'strike',
                 'distribution_text' => '',
                 'distribution_price_text' => '¥ 0',
-                'original_price_text' => '¥ 0'
+                'original_price_text' => ''
             ];
         }
         //返回预约送达时间 数组
diff --git a/app/Service/v3/Implementations/UserAddressService.php b/app/Service/v3/Implementations/UserAddressService.php
index 94d90eb..442cee9 100644
--- a/app/Service/v3/Implementations/UserAddressService.php
+++ b/app/Service/v3/Implementations/UserAddressService.php
@@ -110,7 +110,7 @@ class UserAddressService implements UserAddressServiceInterface
         // $res['distribution_text'] = '¥ '.$distributionPrice .'（' .$distance_text .'）';
         $res['distribution_text'] = $distance_text;
         $res['distribution_price_text'] = '¥ '.$distributionPrice;
-        $res['original_price_text'] = '¥ '.$originalPrice;
+        $res['original_price_text'] = $originalPrice > $distributionPrice ? '¥ '.$originalPrice : '';
         return $res;
     }