diff --git a/app/api/model/Order.php b/app/api/model/Order.php index 520bdca1..f87d8e7f 100644 --- a/app/api/model/Order.php +++ b/app/api/model/Order.php @@ -253,13 +253,29 @@ class Order extends OrderModel $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], ['delivery_status', '<>', DeliveryStatusEnum::DELIVERED], ['order_status', 'in', [OrderStatusEnum::NORMAL, OrderStatusEnum::APPLY_CANCEL]] ]; - break; + break; + //待收货 + case 'receipt': + $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], @@ -268,6 +284,25 @@ class Order extends OrderModel ['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],