Merge branch 'feature/purchase_record' into dev
This commit is contained in:
commit
31a41e7a42
@ -2573,9 +2573,9 @@ class StoreOrderRepository extends BaseRepository
|
||||
* @throws DbException
|
||||
* @throws ModelNotFoundException
|
||||
*/
|
||||
public function purchaseOrder($uid, $keyword, $page, $limit)
|
||||
public function purchaseOrder($where, $keyword, $page, $limit)
|
||||
{
|
||||
$orders = StoreOrder::where('uid', $uid)
|
||||
$orders = StoreOrder::where($where)
|
||||
->where('activity_type', 98)
|
||||
->whereIn('status', [StoreOrder::STATUS_WAIT_COMMENT, StoreOrder::STATUS_FINISH])
|
||||
->where('is_del', 0)
|
||||
|
@ -388,7 +388,7 @@ class StoreOrder extends BaseController
|
||||
{
|
||||
[$page, $limit] = $this->getPage();
|
||||
$keyword = $this->request->param('keyword');
|
||||
$list = $orderRepository->purchaseOrder($this->request->uid(), $keyword, $page, $limit);
|
||||
$list = $orderRepository->purchaseOrder(['supplier_mer_id' => $merId], $keyword, $page, $limit);
|
||||
return app('json')->success($list);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user