update 核销订单
This commit is contained in:
parent
3b59a6203c
commit
3fabc64250
@ -23,10 +23,12 @@ class Order extends BaseController
|
||||
|
||||
public $streetCode; // 镇街道地区码
|
||||
|
||||
public $token;
|
||||
public function __construct(App $app, BaseRepository $repository)
|
||||
{
|
||||
parent::__construct($app);
|
||||
$this->repository = $repository;
|
||||
$this->token = trim($this->request->header('X-Token'));
|
||||
$this->areaCode = $this->request->param('areaCode', '');
|
||||
$this->streetCode = $this->request->param('streetCode', '');
|
||||
|
||||
@ -575,7 +577,18 @@ class Order extends BaseController
|
||||
unset($where['date']);
|
||||
$status = $where['status'];
|
||||
unset($where['status']);
|
||||
$query = $dao->search($where, null)->where($repository->getOrderType($status));
|
||||
$query = $dao->search($where, null)->where($repository->getOrderType($status))>with([
|
||||
'orderProduct',
|
||||
'merchant' => function ($query) {
|
||||
return $query->field('mer_id,mer_name,is_trader');
|
||||
},
|
||||
'groupOrder' => function ($query) {
|
||||
$query->field('group_order_id,group_order_sn');
|
||||
},
|
||||
'user' => function ($query) {
|
||||
$query->field('uid,nickname,avatar');
|
||||
},
|
||||
]);;
|
||||
$count = $query->count();
|
||||
$list = $query->page($page, $limit)->select();
|
||||
return app('json')->success(compact('count', 'list'));
|
||||
|
Loading…
x
Reference in New Issue
Block a user