订单状态筛选

app/api/model/Order.php

@@ -249,10 +249,10 @@ class Order extends OrderModel
         switch ($dataType) {
             case 'all':
                 break;
-            // case 'payment':
-            //     $filter[] = ['pay_status', '=', PayStatusEnum::PENDING];
-            //     $filter[] = ['order_status', '=', OrderStatusEnum::NORMAL];
-            //     break;
+            case 'payment':
+                $filter[] = ['pay_status', '=', PayStatusEnum::PENDING];
+                $filter[] = ['order_status', '=', OrderStatusEnum::NORMAL];
+                break;
             //待付款
             case 'pay':
                 $filter[] = ['pay_status', '=', PayStatusEnum::PENDING];
@@ -276,14 +276,14 @@ class Order extends OrderModel
                 ];
                 break;   
             //待收货    
-            // case 'received':
-            //     $filter = [
-            //         ['pay_status', '=', PayStatusEnum::SUCCESS],
-            //         ['delivery_status', '=', DeliveryStatusEnum::DELIVERED],
-            //         ['receipt_status', '=', ReceiptStatusEnum::NOT_RECEIVED],
-            //         ['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 = [