update 订单列表
This commit is contained in:
parent
3aaf5eb5ab
commit
4f70d330f1
@ -567,14 +567,7 @@ class Order extends BaseController
|
|||||||
$query->where('og.district_code', $this->areaCode);
|
$query->where('og.district_code', $this->areaCode);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
$count = $query->join('product_order_log og', 'StoreOrder.order_id = og.order_id')
|
$count = $query->count();
|
||||||
->where(function($query) {
|
|
||||||
if ($this->streetCode != '') {
|
|
||||||
$query->where('og.street_code', $this->streetCode);
|
|
||||||
} else {
|
|
||||||
$query->where('og.district_code', $this->areaCode);
|
|
||||||
}
|
|
||||||
})->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