|
|
@@ -5074,6 +5074,12 @@ class StoreOrderRepository extends BaseRepository
|
|
5074
|
5074
|
}
|
|
5075
|
5075
|
$query->whereIn('order_id', $ids);
|
|
5076
|
5076
|
}
|
|
|
5077
|
+ if (!empty($where['keywords'])) {
|
|
|
5078
|
+ /** @var StoreOrderProductRepository $storeOrderProductRepository */
|
|
|
5079
|
+ $storeOrderProductRepository = app()->make(StoreOrderProductRepository::class);
|
|
|
5080
|
+ $orderIdList = $storeOrderProductRepository->getOrderIdListByKeyword($where['keywords']);
|
|
|
5081
|
+ $query->whereIn('order_id', $orderIdList);
|
|
|
5082
|
+ }
|
|
5077
|
5083
|
$count = $query->count();
|
|
5078
|
5084
|
$list = $query->with([
|
|
5079
|
5085
|
'orderProduct', 'merchant' => function ($query) {
|