更新
This commit is contained in:
parent
0fd36ed84c
commit
4c8c2dfa8f
@ -164,7 +164,7 @@ class StoreOrderOtherDao extends BaseDao
|
||||
$query->where('order_sn', 'like', '%' . $where['order_sn'] . '%');
|
||||
})
|
||||
->when(isset($where['paid']) && $where['paid'] !== '', function ($query) use ($where) {
|
||||
$query->where('StoreOrderOther.paid', $where['paid']);
|
||||
$query->whereIn('StoreOrderOther.paid', $where['paid']);
|
||||
})
|
||||
->when(isset($where['is_del']) && $where['is_del'] !== '', function ($query) use ($where) {
|
||||
$query->where('StoreOrderOther.is_del', $where['is_del']);
|
||||
|
@ -85,7 +85,7 @@ class StoreProduct extends BaseController
|
||||
*/
|
||||
public function getStatusFilter()
|
||||
{
|
||||
return app('json')->success($this->repository->getFilter(null,'商品',0));
|
||||
return app('json')->success($this->repository->getFilter(null,'商品',[0,98]));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -58,6 +58,7 @@ class OrderOther extends BaseController
|
||||
[$page, $limit] = $this->getPage();
|
||||
$where = $this->request->params(['status', 'date', 'order_sn', 'username', 'order_type', 'keywords', 'order_id', 'activity_type', 'group_order_sn', 'store_name']);
|
||||
$where['mer_id'] = $this->request->merId();
|
||||
$where['paid']=[1,2];
|
||||
return app('json')->success($this->repository->merchantGetList($where, $page, $limit));
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user