liuqing
/
htb_backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
main
fengxinyhyl 8 months ago
parent c080baf569
commit d0bd89a0a3
1 changed files with 2 additions and 2 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      app/controller/admin/order/Order.php

4
app/controller/admin/order/Order.php
Unescape View File

@ -34,7 +34,7 @@ class Order extends BaseController
public function lst($id) public function lst($id)
{ {
[$page, $limit] = $this->getPage(); [$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['reconciliation_type'] = $this->request->param('status', 1);
$where['mer_id'] = $id; $where['mer_id'] = $id;
return app('json')->success($this->repository->adminMerGetList($where, $page, $limit)); return app('json')->success($this->repository->adminMerGetList($where, $page, $limit));
@ -70,7 +70,7 @@ class Order extends BaseController
public function getAllList() public function getAllList()
{ {
[$page, $limit] = $this->getPage(); [$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); $data = $this->repository->adminGetList($where, $page, $limit);
return app('json')->success($data); return app('json')->success($data);
} }

Write Preview
Loading…
Cancel
Save