Merge branch 'feature/purchase_record' into dev
This commit is contained in:
commit
288d615761
@ -98,7 +98,7 @@ class StoreOrderDao extends BaseDao
|
||||
->when(isset($where['status']) && $where['status'] !== '', function ($query) use ($where) {
|
||||
switch ($where['status']) {
|
||||
case 0 :
|
||||
$query->whereIn('StoreOrder.status', [0, 9]);
|
||||
$query->where('paid', 1)->whereIn('StoreOrder.status', [0, 9]);
|
||||
break;
|
||||
case -2 :
|
||||
$query->whereNotIn('StoreOrder.status', [10, 11]);
|
||||
@ -107,13 +107,13 @@ class StoreOrderDao extends BaseDao
|
||||
$query->where('paid', 1)->whereIn('StoreOrder.status', [10, 11]);
|
||||
break;
|
||||
case 2 :
|
||||
$query->where('StoreOrder.status', $where['status'])->where('pay_type', '<>', StoreGroupOrder::PAY_TYPE_CREDIT_BUY);
|
||||
$query->where('paid', 1)->where('StoreOrder.status', $where['status'])->where('pay_type', '<>', StoreGroupOrder::PAY_TYPE_CREDIT_BUY);
|
||||
break;
|
||||
case 20 :
|
||||
$query->where('StoreOrder.status', 2);
|
||||
$query->where('paid', 1)->where('StoreOrder.status', 2);
|
||||
break;
|
||||
default:
|
||||
$query->where('StoreOrder.status', $where['status']);
|
||||
$query->where('paid', 1)->where('StoreOrder.status', $where['status']);
|
||||
break;
|
||||
}
|
||||
})
|
||||
|
Loading…
x
Reference in New Issue
Block a user