|
|
@@ -123,6 +123,14 @@ class StoreOrderDao extends BaseDao
|
|
123
|
123
|
->whereOr('order_id', 'in', $orderIdList);
|
|
124
|
124
|
});
|
|
125
|
125
|
})
|
|
|
126
|
+ ->when(isset($where['product_keywords']) && $where['product_keywords'] !== '', function ($query) use ($where) {
|
|
|
127
|
+ $query->where(function ($query) use ($where) {
|
|
|
128
|
+ /** @var StoreOrderProductRepository $storeOrderProductRepository */
|
|
|
129
|
+ $storeOrderProductRepository = app()->make(StoreOrderProductRepository::class);
|
|
|
130
|
+ $orderIdList = $storeOrderProductRepository->getOrderIdListByKeyword($where['keywords']);
|
|
|
131
|
+ $query->where('order_id', 'in', $orderIdList);
|
|
|
132
|
+ });
|
|
|
133
|
+ })
|
|
126
|
134
|
->when(isset($where['reconciliation_type']) && $where['reconciliation_type'] !== '', function ($query) use ($where) {
|
|
127
|
135
|
$query->when($where['reconciliation_type'], function ($query) use ($where) {
|
|
128
|
136
|
$query->where('reconciliation_id', '<>', 0);
|