商家中心线上订单

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();
         //

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);