|
|
|
@ -34,7 +34,7 @@ class Order extends BaseController |
|
|
|
|
public function lst($id) |
|
|
|
|
{ |
|
|
|
|
[$page, $limit] = $this->getPage(); |
|
|
|
|
$where = $this->request->params(['date','order_sn','order_type','keywords','username','activity_type','group_order_sn','store_name']); |
|
|
|
|
$where = $this->request->params(['date','order_sn','order_type','keywords','username','activity_type','group_order_sn','store_name', 'pay_select']); |
|
|
|
|
$where['reconciliation_type'] = $this->request->param('status', 1); |
|
|
|
|
$where['mer_id'] = $id; |
|
|
|
|
return app('json')->success($this->repository->adminMerGetList($where, $page, $limit)); |
|
|
|
@ -70,7 +70,7 @@ class Order extends BaseController |
|
|
|
|
public function getAllList() |
|
|
|
|
{ |
|
|
|
|
[$page, $limit] = $this->getPage(); |
|
|
|
|
$where = $this->request->params(['type', 'date', 'mer_id','keywords','status','username','order_sn','is_trader','activity_type','group_order_sn','store_name']); |
|
|
|
|
$where = $this->request->params(['type', 'date', 'mer_id','keywords','status','username','order_sn','is_trader','activity_type','group_order_sn','store_name', 'pay_select']); |
|
|
|
|
$data = $this->repository->adminGetList($where, $page, $limit); |
|
|
|
|
return app('json')->success($data); |
|
|
|
|
} |
|
|
|
|