|
@@ -279,9 +279,10 @@ class Order extends OrderModel
|
|
|
$filter['delivery_status'] = DeliveryStatusEnum::DELIVERED;
|
|
$filter['delivery_status'] = DeliveryStatusEnum::DELIVERED;
|
|
|
$filter['receipt_status'] = ReceiptStatusEnum::NOT_RECEIVED;
|
|
$filter['receipt_status'] = ReceiptStatusEnum::NOT_RECEIVED;
|
|
|
break;
|
|
break;
|
|
|
- case 'deliver';
|
|
|
|
|
- $filter['order_status'] = OrderStatusEnum::COMPLETED;
|
|
|
|
|
- $filter['is_comment'] = 0;
|
|
|
|
|
|
|
+ case 'delivery';
|
|
|
|
|
+ $filter['pay_status'] = PayStatusEnum::SUCCESS;
|
|
|
|
|
+ $filter['delivery_status'] = DeliveryStatusEnum::NOT_DELIVERED;
|
|
|
|
|
+ $filter['order_status'] = OrderStatusEnum::NORMAL;
|
|
|
break;
|
|
break;
|
|
|
case 'comment';
|
|
case 'comment';
|
|
|
$filter['is_comment'] = 0;
|
|
$filter['is_comment'] = 0;
|
|
@@ -378,7 +379,7 @@ class Order extends OrderModel
|
|
|
{
|
|
{
|
|
|
return [
|
|
return [
|
|
|
'payment' => $this->getCount('payment'),
|
|
'payment' => $this->getCount('payment'),
|
|
|
- 'deliver' => $this->getCount('deliver'),
|
|
|
|
|
|
|
+ 'delivery' => $this->getCount('delivery'),
|
|
|
'received' => $this->getCount('received')
|
|
'received' => $this->getCount('received')
|
|
|
];
|
|
];
|
|
|
}
|
|
}
|