mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed

Browse Source
This commit is contained in:
chenbo 2023-12-09 13:35:47 +08:00
parent ac4023b113
commit 11b03d7880
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controller/api/dataview/Order.php
View File

@ -577,7 +577,7 @@ class Order extends BaseController
unset($where['date']); unset($where['date']);
$status = $where['status']; $status = $where['status'];
unset($where['status']); unset($where['status']);
$query = $dao->search($where, null)->where($repository->getOrderType($status))>with([ $query = $dao->search($where, null)->where($repository->getOrderType($status))->with([
'orderProduct', 'orderProduct',
'merchant' => function ($query) { 'merchant' => function ($query) {
return $query->field('mer_id,mer_name,is_trader'); return $query->field('mer_id,mer_name,is_trader');
@ -588,7 +588,7 @@ class Order extends BaseController
'user' => function ($query) { 'user' => function ($query) {
$query->field('uid,nickname,avatar'); $query->field('uid,nickname,avatar');
}, },
]);; ]);
$count = $query->count(); $count = $query->count();
$list = $query->page($page, $limit)->select(); $list = $query->page($page, $limit)->select();
return app('json')->success(compact('count', 'list')); return app('json')->success(compact('count', 'list'));