pdkj
/
jiqu-library-server
6
0
Fork 0
Code Releases Activity

调整订单搜索

release
vine_liutk 2022-01-15 15:32:51 +08:00 committed by 李静
parent 0fe2f5779a
commit 3bf9034940
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Endpoint/Api/Filters/DealerOrderFilter.php
View File

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

8
app/Models/DealerOrder.php
View File

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