diff --git a/app/Endpoint/Api/Filters/DealerOrderFilter.php b/app/Endpoint/Api/Filters/DealerOrderFilter.php index df99b425..b77c5f21 100644 --- a/app/Endpoint/Api/Filters/DealerOrderFilter.php +++ b/app/Endpoint/Api/Filters/DealerOrderFilter.php @@ -18,9 +18,12 @@ class DealerOrderFilter extends ModelFilter case 'wait_paid'://待收款 $this->onlyPaid(); break; - case 'wait_shippinged'://待收货 + case 'wait_shipping'://待发货 $this->onlyShipping(); break; + case 'wait_shippinged'://待收货 + $this->onlyShippinged(); + break; case 'completed'://已完成 $this->onlyCompleted(); break; diff --git a/app/Models/DealerOrder.php b/app/Models/DealerOrder.php index f53485d2..d59eb00c 100644 --- a/app/Models/DealerOrder.php +++ b/app/Models/DealerOrder.php @@ -88,17 +88,25 @@ class DealerOrder extends Model } /** - * 待收款+待发货 + * 待收款 */ public function scopeOnlyPaid($query) { return $query->where('status', DealerOrderStatus::Confirming); } + /** + * 待发货 + */ + public function scopenOnliyShipping($query) + { + return $query->where('status', DealerOrderStatus::Paid); + } + /** * 已发货/待收货 */ - public function scopeOnlyShipping($query) + public function scopeOnlyShippinged($query) { // return $query->whereIn('status', [ // DealerOrderStatus::Confirming, DealerOrderStatus::Paid, DealerOrderStatus::Shipped,