From 3394a996a7e8fbbf7815285c5d721bd2ac77e94f Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Wed, 9 Sep 2020 21:15:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=AE=B6=E4=B8=AD=E5=BF=83=E7=BA=BF?=
 =?UTF-8?q?=E4=B8=8A=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/v3/OrderOnlineController.php         |  2 +-
 app/Service/v3/Implementations/OrderListService.php | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/Controller/v3/OrderOnlineController.php b/app/Controller/v3/OrderOnlineController.php
index 5e544e6..f85a6d2 100644
--- a/app/Controller/v3/OrderOnlineController.php
+++ b/app/Controller/v3/OrderOnlineController.php
@@ -92,7 +92,7 @@ class OrderOnlineController extends BaseController
         ])
             ->select('id')
             ->first();
-        $res['location'] = $this->userAddressService->getAddressAndDistributionRrice($address->id,$marketId);
+        //$res['location'] = $this->userAddressService->getAddressAndDistributionRrice($address->id,$marketId);
         //返回预约送达时间 数组
         $res['appointment_time'] = $this->appointmentTimeService->do();
         //
diff --git a/app/Service/v3/Implementations/OrderListService.php b/app/Service/v3/Implementations/OrderListService.php
index 4cd468e..7b87e38 100644
--- a/app/Service/v3/Implementations/OrderListService.php
+++ b/app/Service/v3/Implementations/OrderListService.php
@@ -136,14 +136,14 @@ class OrderListService implements OrderListServiceInterface
         switch ($tab) {
             case 'all':
                 break;
-            case 'completed':
-                $builder->whereIn('lanzu_order_main.state', OrderState::FINISH);
+            case 'paid':
+                $builder->where('lanzu_order_main.state', OrderState::PAID);
                 break;
-            case 'unpaid':
-                $builder->where(['lanzu_order_main.state' => OrderState::UNPAID]);
+            case 'delivery':
+                $builder->where(['lanzu_order_main.state' => OrderState::DELIVERY]);
                 break;
-            case 'receiving':
-                $builder->whereIn('lanzu_order_main.state', OrderState::RECEIVING);
+            case 'finish':
+                $builder->whereIn('lanzu_order_main.state', OrderState::FINISH);
                 break;
             case 'refund':
                 $builder->whereIn('lanzu_order_main.state', OrderState::REFUND);