调整订单搜索

app/Endpoint/Api/Filters/DealerOrderFilter.php

@@ -15,7 +15,7 @@ class DealerOrderFilter extends ModelFilter
             case 'wait_pay'://待付款
                 $this->onlyPendinged();
                 break;
-            case 'wait_shipping'://待发货
+            case 'wait_paid'://待收款
                 $this->onlyPaid();
                 break;
             case 'wait_shippinged'://待收货

app/Models/DealerOrder.php

@@ -71,9 +71,7 @@ class DealerOrder extends Model
      */
     public function scopeOnlyPaid($query)
     {
-        return $query->whereBetween('status', [
-            DealerOrderStatus::Confirming, DealerOrderStatus::Shipped,
-        ]);
+        return $query->where('status', DealerOrderStatus::Confirming);
     }
 
     /**
@@ -81,7 +79,9 @@ class DealerOrder extends Model
      */
     public function scopeOnlyShipping($query)
     {
-        return $query->where('status', DealerOrderStatus::Shipped);
+        return $query->whereIn('status', [
+            DealerOrderStatus::Confirming, DealerOrderStatus::Paid, DealerOrderStatus::Shipped,
+        ]);
     }
 
     /**