|
|
@@ -86,7 +86,7 @@ class OrderService extends BaseService
|
|
|
->where(function ($query) use ($params) {
|
|
|
$keyword = isset($params['keyword']) ? $params['keyword'] : '';
|
|
|
if ($keyword) {
|
|
|
- $query->where('b.nickname', 'like', "%{$keyword}%")->orWhere('b.mobile', 'like', "%{$keyword}%")->orWhere('g.goods_name', 'like', "%{$keyword}%");
|
|
|
+ $query->where('b.nickname', 'like', "%{$keyword}%")->orWhere('b.mobile', 'like', "%{$keyword}%")->orWhere('g.company_name', 'like', "%{$keyword}%");
|
|
|
}
|
|
|
})
|
|
|
->where(function ($query) use ($userId) {
|
|
|
@@ -94,7 +94,7 @@ class OrderService extends BaseService
|
|
|
$query->where('a.user_id', '=', $userId);
|
|
|
}
|
|
|
})
|
|
|
- ->select(['a.*', 'b.nickname', 'b.mobile as buy_mobile', 'c.name as cate_name', 'g.goods_name', 'g.code', 'g.thumb'])
|
|
|
+ ->select(['a.*', 'b.nickname', 'b.mobile as buy_mobile', 'c.name as cate_name', 'g.goods_name', 'g.company_name', 'g.code', 'g.thumb'])
|
|
|
->orderBy('a.pay_time', 'desc')
|
|
|
->orderBy('a.id', 'desc')
|
|
|
->paginate($pageSize > 0 ? $pageSize : 9999999);
|
APPLE