|
|
@@ -172,7 +172,7 @@ class OrderService implements OrderServiceInterface
|
|
|
$where1 = [];
|
|
|
//nickname like
|
|
|
if (!empty($data['user_name'])) {
|
|
|
- $where1[] = ['user.nickname', 'like', '%' . $data['user_name'] . '%'];
|
|
|
+ $where1[] = ['user.user_name', 'like', '%' . $data['user_name'] . '%'];
|
|
|
}
|
|
|
|
|
|
//website_name
|
|
|
@@ -204,7 +204,7 @@ class OrderService implements OrderServiceInterface
|
|
|
->select(
|
|
|
'order.*',
|
|
|
'admin_user.user_name as admin_user_name',
|
|
|
- 'user.nickname as user_name',
|
|
|
+ 'user.user_name as user_name',
|
|
|
'website.website_name as website_name'
|
|
|
)
|
|
|
->orderBy('order.id', 'desc');
|
