Merge branch 'feature/purchase_record' into dev
This commit is contained in:
commit
42b62e098e
@ -65,7 +65,11 @@ class StoreGroupOrderDao extends BaseDao
|
||||
}
|
||||
return StoreGroupOrder::hasWhere('orderList', $storeOrderWhere)
|
||||
->when(isset($where['paid']) && $where['paid'] !== '', function ($query) use ($where) {
|
||||
$query->where('StoreGroupOrder.paid', $where['paid']);
|
||||
if ($where['paid'] == 0) {
|
||||
$query->whereRaw("StoreGroupOrder.paid=0 or (StoreGroupOrder.paid=1 and StoreGroupOrder.pay_type=8)");
|
||||
} else {
|
||||
$query->where('StoreGroupOrder.paid', $where['paid']);
|
||||
}
|
||||
})->when(isset($where['uid']) && $where['uid'] !== '', function ($query) use ($where) {
|
||||
$query->where('StoreGroupOrder.uid', $where['uid']);
|
||||
})->order('create_time DESC')->when(isset($where['is_del']) && $where['is_del'] !== '', function ($query) use ($where) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user