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

Merge branch 'feature/purchase_record' into dev

Browse Source
This commit is contained in:
luofei 2023-07-14 15:06:45 +08:00
commit 31a41e7a42
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/common/repositories/store/order/StoreOrderRepository.php
View File

@ -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)

2
app/controller/api/server/StoreOrder.php
View File

@ -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);
}