update 商户列表
This commit is contained in:
parent
df99931cb5
commit
cde081fda0
@ -559,7 +559,14 @@ class Order extends BaseController
|
|||||||
'user' => function ($query) {
|
'user' => function ($query) {
|
||||||
$query->field('uid,nickname,avatar');
|
$query->field('uid,nickname,avatar');
|
||||||
},
|
},
|
||||||
]);
|
])->join('product_order_log og', 'o.order_id = og.order_id')
|
||||||
|
->where(function($query) {
|
||||||
|
if ($this->streetCode != '') {
|
||||||
|
$query->where('og.street_code', $this->streetCode);
|
||||||
|
} else {
|
||||||
|
$query->where('og.district_code', $this->areaCode);
|
||||||
|
}
|
||||||
|
});
|
||||||
$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'));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user