订单状态筛选

app/api/model/Order.php

@@ -249,10 +249,16 @@ class Order extends OrderModel
         switch ($dataType) {
             case 'all':
                 break;
-            case 'payment':
+            // case 'payment':
+            //     $filter[] = ['pay_status', '=', PayStatusEnum::PENDING];
+            //     $filter[] = ['order_status', '=', OrderStatusEnum::NORMAL];
+            //     break;
+            //待付款
+            case 'pay':
                 $filter[] = ['pay_status', '=', PayStatusEnum::PENDING];
                 $filter[] = ['order_status', '=', OrderStatusEnum::NORMAL];
                 break;    
+            //待发货
             case 'delivery':
                 $filter = [
                     ['pay_status', '=', PayStatusEnum::SUCCESS],
@@ -260,7 +266,8 @@ class Order extends OrderModel
                     ['order_status', 'in', [OrderStatusEnum::NORMAL, OrderStatusEnum::APPLY_CANCEL]]
                 ];
                 break; 
-            case 'received':
+            //待收货
+            case 'receipt':
                 $filter = [
                     ['pay_status', '=', PayStatusEnum::SUCCESS],
                     ['delivery_status', '=', DeliveryStatusEnum::DELIVERED],
@@ -268,6 +275,34 @@ class Order extends OrderModel
                     ['order_status', '=', OrderStatusEnum::NORMAL]
                 ];
                 break;   
+            //待收货    
+            // case 'received':
+            //     $filter = [
+            //         ['pay_status', '=', PayStatusEnum::SUCCESS],
+            //         ['delivery_status', '=', DeliveryStatusEnum::DELIVERED],
+            //         ['receipt_status', '=', ReceiptStatusEnum::NOT_RECEIVED],
+            //         ['order_status', '=', OrderStatusEnum::NORMAL]
+            //     ];
+            //     break;
+            //已完成
+            case 'complete':
+                $filter = [
+                    ['order_status', '=', OrderStatusEnum::COMPLETED]
+                ];
+                break;
+            //待取消
+            case 'apply_cancel':
+                $filter = [
+                    ['order_status', '=', OrderStatusEnum::APPLY_CANCEL]
+                ];
+                break;
+            //已取消
+            case 'cancel':
+                $filter = [
+                    ['order_status', '=', OrderStatusEnum::CANCELLED]
+                ];
+                break;
+            //已评价           
             case 'comment':
                 $filter = [
                     ['is_comment', '=', 0],