|
|
|
@ -263,7 +263,8 @@ class Order extends OrderModel |
|
|
|
|
$filter = [ |
|
|
|
|
['pay_status', '=', PayStatusEnum::SUCCESS], |
|
|
|
|
['delivery_status', '<>', DeliveryStatusEnum::DELIVERED], |
|
|
|
|
['order_status', 'in', [OrderStatusEnum::NORMAL, OrderStatusEnum::APPLY_CANCEL]] |
|
|
|
|
['order_status', 'in', [OrderStatusEnum::NORMAL]], |
|
|
|
|
// ['order_status', 'in', [OrderStatusEnum::NORMAL, OrderStatusEnum::APPLY_CANCEL]] |
|
|
|
|
]; |
|
|
|
|
break; |
|
|
|
|
//待收货 |
|
|
|
|