|
@@ -120,7 +120,10 @@ class StoreOrderDao extends BaseDao
|
|
120
|
->whereOr('user_phone', 'like', "%{$where['keywords']}%")
|
120
|
->whereOr('user_phone', 'like', "%{$where['keywords']}%")
|
|
121
|
->whereOr('order_sn', 'like', '%' . $where['keywords'] . '%')
|
121
|
->whereOr('order_sn', 'like', '%' . $where['keywords'] . '%')
|
|
122
|
->whereOr('verify_code', 'like', '%' . $where['keywords'] . '%')
|
122
|
->whereOr('verify_code', 'like', '%' . $where['keywords'] . '%')
|
|
123
|
- ->whereOr('order_id', 'in', $orderIdList);
|
|
|
|
|
|
123
|
+ ->whereOr('order_id', 'in', $orderIdList)
|
|
|
|
124
|
+ ->whereOr('group_order_id', 'in', function ($query) use ($where) {
|
|
|
|
125
|
+ $query->name('store_group_order')->where('like', 'hf_pay_id', "%" . $where['keywords'] . "%")->field('group_order_id');
|
|
|
|
126
|
+ });
|
|
124
|
});
|
127
|
});
|
|
125
|
})
|
128
|
})
|
|
126
|
->when(isset($where['product_keywords']) && $where['product_keywords'] !== '', function ($query) use ($where) {
|
129
|
->when(isset($where['product_keywords']) && $where['product_keywords'] !== '', function ($query) use ($where) {
|