修改用户昵称搜索

app/Http/Controllers/admin/Backflow.php

@@ -37,6 +37,7 @@ class Backflow extends Controller
                 'page' => ['required', 'integer', 'min:1'],
                 'limit' => ['required', 'integer', 'min:1'],
                 'member_id' => ['nullable', 'string'],
+                'first_name' => ['nullable'],
                 'date' => ['nullable', 'date_format:Y-m'],
                 'username' => ['nullable', 'string'],
             ]);

app/Http/Controllers/admin/Balance.php

@@ -26,10 +26,12 @@ class Balance extends Controller
                 'change_type' => ['nullable', 'string', 'in:' . implode(',', BalanceLogService::$RW)],
                 'start_time' => ['nullable', 'date', 'date_format:Y-m-d', 'required_with:end_time'],
                 'end_time' => ['nullable', 'date', 'date_format:Y-m-d', 'required_with:start_time'],
+                'first_name' => ['nullable'],
             ]);
             $page = request()->input('page', 1);
             $limit = request()->input('limit', 10);
-            $query = BalanceLog::where(BalanceLogService::getWhere($params));
+            $query = BalanceLog::join('users', 'users.member_id', '=', 'balance_logs.member_id')
+                        ->where(BalanceLogService::getWhere($params));
             $data['total'] = $query->count();
             $totalAmount = '--';
             //如果指定用户和类型，则统计变动金额
@@ -38,7 +40,7 @@ class Balance extends Controller
                 $totalAmount = bcadd($totalAmount, 0, 2);
             }
             $data['total_amount'] =$totalAmount;
-            $data['data'] = $query->orderByDesc('id')
+            $data['data'] = $query->select("balance_logs.*", "users.first_name","users.admin_note as user_admin_note")->orderByDesc('id')
                 ->forPage($page, $limit)->with(['member'])
                 ->get()->toArray();
 

app/Http/Controllers/admin/Bet.php

@@ -20,6 +20,7 @@ class Bet extends Controller
                 'page' => ['nullable', 'integer', 'min:1'],
                 'limit' => ['nullable', 'integer', 'min:1'],
                 'member_id' => ['nullable', 'string'],
+                'first_name' => ['nullable'],
                 'keywords' => ['nullable', 'string', 'min:1'],
                 'issue_no' => ['nullable', 'string'],
                 'id' => ['nullable', 'string'],
@@ -42,6 +43,13 @@ class Bet extends Controller
                     $query->where('username', $username);
                 });
             }
+            $first_name = $params['first_name'] ?? '';
+            $query = $query->with(['user', 'issue', 'pcIssue'])
+            ->when($first_name, function ($query) use ($first_name) {
+                $query->whereHas('user', function ($q) use ($first_name) {
+                    $q->where('first_name', 'like', "%{$first_name}%");
+                });
+            });
 
             $count = $query->count();
             $totalAmount = '--';
@@ -53,7 +61,7 @@ class Bet extends Controller
 
             }
 
-            $query->with(['user', 'issue', 'pcIssue'])->orderByDesc('id');
+            $query->orderByDesc('id');
             $list = $query->forPage($page, $limit)->get()->toArray();
 
 

app/Http/Controllers/admin/LhcOrder.php

@@ -25,6 +25,7 @@ class LhcOrder extends Controller
                 'issue' => ['nullable', 'string'],
                 'ordernum' => ['nullable', 'string'],
                 'member_id' => ['nullable', 'integer'],
+                'first_name' => ['nullable'],
                 'game' => ['nullable', 'string'],
                 'gameplay' => ['nullable', 'string'],
                 'number' => ['nullable'],
@@ -37,40 +38,45 @@ class LhcOrder extends Controller
             $limit = request()->input('limit', 15);
 
             $query = new LhcOrderModel();
+            
+            $query = LhcOrderModel::join('users', 'users.member_id', '=', 'lhc_order.member_id');
             if (!empty($params['id'])) {
-                $query = $query->where('id', $params['id']);
+                $query = $query->where('lhc_order.id', $params['id']);
             }
             if (!empty($params['issue'])) {
-                $query = $query->where('issue', $params['issue']);
+                $query = $query->where('lhc_order.issue', $params['issue']);
             }
             if (!empty($params['ordernum'])) {
-                $query = $query->where('ordernum', $params['ordernum']);
+                $query = $query->where('lhc_order.ordernum', $params['ordernum']);
             }
             if (!empty($params['member_id'])) {
-                $query = $query->where('member_id', $params['member_id']);
+                $query = $query->where('lhc_order.member_id', $params['member_id']);
             }
             if (isset($params['lottery_status']) && $params['lottery_status'] !== null) {
-                $query = $query->where('lottery_status', $params['lottery_status']);
+                $query = $query->where('lhc_order.lottery_status', $params['lottery_status']);
             }
             if (isset($params['is_faker']) && $params['is_faker'] !== null) {
-                $query = $query->where('is_faker', $params['is_faker']);
+                $query = $query->where('lhc_order.is_faker', $params['is_faker']);
             }
             if (!empty($params['game'])) {
-                $query = $query->where('game', $params['game']);
+                $query = $query->where('lhc_order.game', $params['game']);
             }
             if (!empty($params['gameplay'])) {
-                $query = $query->where('gameplay', $params['gameplay']);
+                $query = $query->where('lhc_order.gameplay', $params['gameplay']);
             }
             if (!empty($params['number'])) {
-                $query = $query->where('number', $params['number']);
+                $query = $query->where('lhc_order.number', $params['number']);
             }
             if (!empty($params['type'])) {
-                $query = $query->where('type', $params['type']);
+                $query = $query->where('lhc_order.type', $params['type']);
+            }
+            if (!empty($params['first_name'])) {
+                $query = $query->where('users.first_name', 'like', "%{$params['first_name']}%");
             }
             $count = $query->count();
             $list = $query->with(['lottery'])
                 ->forPage($page, $limit)
-                ->orderByDesc('created_at')
+                ->orderByDesc('lhc_order.created_at')
                 ->get();
         } catch (Exception $e) {
             return $this->error(HttpStatus::CUSTOM_ERROR,$e->getMessage());

app/Http/Controllers/admin/Operation.php

@@ -24,6 +24,8 @@ class Operation extends Controller
                 'start_time' => ['nullable', 'date', 'date_format:Y-m-d', 'required_with:end_time'],
                 'end_time' => ['nullable', 'date', 'date_format:Y-m-d', 'required_with:start_time'],
                 'user_id' => ['nullable', 'string'],
+                'member_id' => ['nullable'],
+                'first_name' => ['nullable'],
             ]);
             $page = request()->input('page', 1);
             $limit = request()->input('limit', 15);
@@ -35,6 +37,12 @@ class Operation extends Controller
                     ->orWhere('users.first_name', 'like', "%{$user_id}%");
                 });
             }
+            if (!empty($params['member_id'])) {
+                $query = $query->where('users.member_id', $params['member_id']);
+            }
+            if (!empty($params['first_name'])) {
+                $query = $query->where('users.first_name', 'like', "%{$params['first_name']}%");
+            }
 
             $count = $query->count();
             $list = $query->join('wallets', 'users.member_id', '=', 'wallets.member_id')

app/Http/Controllers/admin/Order.php

@@ -77,6 +77,9 @@ class Order extends Controller
                 'limit' => ['nullable', 'integer', 'min:1'],
                 'id' => ['nullable', 'string'],
                 'user_id' => ['nullable', 'string'],
+                'member_id' => ['nullable'],
+                'first_name' => ['nullable'],
+                'user_id' => ['nullable', 'string'],
                 'id' => ['nullable'],
                 'order_id' => ['nullable', 'string'],
                 'issue' => ['nullable', 'integer'],
@@ -96,7 +99,8 @@ class Order extends Controller
             $limit = request()->input('limit', 15);
 
             $query = OrderModel::join('sport_odds', 'sport_odds.odd_name_en', '=', 'sport_order.odd_name')
-                        ->join('sport', 'sport.data_id', '=', 'sport_order.issue');
+                        ->join('sport', 'sport.data_id', '=', 'sport_order.issue')
+                        ->join('users', 'users.user_id', '=', 'sport_order.user_id');
             if (!empty($params['id'])) {
                 $query = $query->where('sport_order.id', $params['id']);
             }
@@ -144,10 +148,18 @@ class Order extends Controller
             if (!empty($params['guest_team'])) {
                 $query = $query->where('guest_team|guest_team_en', 'like', '%' . $params['guest_team'] . '%');
             }
+            if (!empty($params['member_id'])) {
+                $query = $query->where('users.member_id', $params['member_id']);
+            }
+            if (!empty($params['first_name'])) {
+                $query = $query->where('users.first_name', 'like', "%{$params['first_name']}%");
+            }
             
             $count = $query->distinct()->count('sport_order.id');
             $list = $query->distinct()
-                ->select(['sport_order.*','sport_odds.odd_name as odd_name', 'sport.league', 'sport.league_en', 'sport.home_team', 'sport.home_team_en','sport.home_team_logo', 'sport.guest_team', 'sport.guest_team_en','sport.guest_team_logo'])
+                ->select(['sport_order.*','sport_odds.odd_name as odd_name', 'sport.league', 'sport.league_en', 'sport.home_team', 'sport.home_team_en','sport.home_team_logo', 'sport.guest_team', 'sport.guest_team_en','sport.guest_team_logo',
+                    'users.member_id','users.first_name'
+                ])
                 ->forPage($page, $limit)
                 ->orderByDesc('sport_order.create_time')
                 ->get();

app/Http/Controllers/admin/Withdraw.php

@@ -49,18 +49,21 @@ class Withdraw extends Controller
                 'page' => ['nullable', 'integer', 'min:1'],
                 'limit' => ['nullable', 'integer', 'min:1'],
                 'member_id' => ['nullable', 'string', 'min:1'],
-                'status' => ['nullable', 'integer', 'min:0', 'max:3']
+                'status' => ['nullable', 'integer', 'min:0', 'max:3'],
+                'first_name' => ['nullable'],
             ]);
             $page = request()->input('page', 1);
             $limit = request()->input('limit', 10);
             $params['type'] = 2;
-            $query = PaymentOrder::query();
+            
+            $query = PaymentOrder::join('users', 'users.member_id', '=', 'payment_orders.member_id')
+                        ->select("payment_orders.*", "users.first_name","users.admin_note as user_admin_note");
+                        
             $where = PaymentOrderService::getWhere($params);
             $count = $query->where($where)->count();
             $list = $query->where($where)
-                ->with(['userInfo'])
-                ->orderByRaw('CASE WHEN status = 0 THEN 0 ELSE 1 END')
-                ->orderByDesc('created_at')
+                ->orderByRaw('CASE WHEN bot_payment_orders.status = 0 THEN 0 ELSE 1 END')
+                ->orderByDesc('payment_orders.created_at')
                 ->forpage($page, $limit)->get()->toArray();
 
             $totalAmount = 0;
@@ -109,22 +112,23 @@ class Withdraw extends Controller
 
     public function index()
     {
-        try {
+        // try {
             $params = request()->validate([
                 'page' => ['nullable', 'integer', 'min:1'],
                 'limit' => ['nullable', 'integer', 'min:1'],
                 'member_id' => ['nullable', 'string', 'min:1'],
-                'status' => ['nullable', 'integer', 'min:0', 'max:2']
+                'status' => ['nullable', 'integer', 'min:0', 'max:2'],
+                'first_name' => ['nullable'],
             ]);
             $page = request()->input('page', 1);
             $limit = request()->input('limit', 10);
-            $query = WithdrawModel::query();
+            $query = WithdrawModel::join('users', 'users.member_id', '=', 'withdraws.member_id')
+                        ->select("withdraws.*", "users.first_name","users.admin_note as user_admin_note");
             $where = WithdrawService::getWhere($params);
             $count = $query->where($where)->count();
             $list = $query->where($where)
-                ->with(['member'])
-                ->orderByRaw('CASE WHEN status = 0 THEN 0 ELSE 1 END')
-                ->orderByDesc('created_at')
+                ->orderByRaw('CASE WHEN bot_withdraws.status = 0 THEN 0 ELSE 1 END')
+                ->orderByDesc('withdraws.created_at')
                 ->forpage($page, $limit)->get();
             $totalAmount = 0;
             $totalSuccess = 0;
@@ -148,11 +152,11 @@ class Withdraw extends Controller
                 'total_fail' => $totalFail,
                 'data' => $list,
             ];
-        } catch (ValidationException $e) {
-            return $this->error(HttpStatus::CUSTOM_ERROR, $e->validator->errors()->first());
-        } catch (Exception $e) {
-            return $this->error(intval($e->getCode()));
-        }
+        // } catch (ValidationException $e) {
+        //     return $this->error(HttpStatus::CUSTOM_ERROR, $e->validator->errors()->first());
+        // } catch (Exception $e) {
+        //     return $this->error(intval($e->getCode()));
+        // }
         return $this->success($result);
     }
 

app/Http/Controllers/admin/YueBao.php

@@ -22,31 +22,40 @@ class YueBao extends Controller
                 'limit' => ['nullable', 'integer', 'min:1'],
                 'id' => ['nullable', 'integer', 'min:1'],
                 'user_id' => ['nullable'],
+                'member_id' => ['nullable'],
+                'first_name' => ['nullable'],
                 'start_time' => ['nullable', 'date', 'date_format:Y-m-d', 'required_with:end_time'],
                 'end_time' => ['nullable', 'date', 'date_format:Y-m-d', 'required_with:start_time'],
             ]);
             $page = request()->input('page', 1);
             $limit = request()->input('limit', 15);
 
-            $query = new YuebaoItem();
+            $query = YuebaoItem::join('users', 'users.user_id', '=', 'yuebao_item.user_id')
+            ->select("yuebao_item.*", "users.first_name","users.member_id","users.admin_note as user_admin_note");
             if (!empty($params['id'])) {
-                $query = $query->where('id', $params['id']);
+                $query = $query->where('yuebao_item.id', $params['id']);
             }
             if (!empty($params['user_id'])) {
-                $query = $query->where('user_id', $params['user_id']);
+                $query = $query->where('yuebao_item.user_id', $params['user_id']);
+            }
+            if (!empty($params['member_id'])) {
+                $query = $query->where('yuebao_item.user_id', $params['member_id']);
             }
             if (!empty($params['start_time'])) {
                 $startTime = strtotime($params['start_time'] . " 00:00:00");
-                $query = $query->where('create_time', '>=', $startTime);
+                $query = $query->where('yuebao_item.create_time', '>=', $startTime);
             }
             if (!empty($params['end_time'])) {
                 $endTime = strtotime($params['end_time'] . " 23:59:59");
-                $query = $query->where('create_time', '<=', $endTime);
+                $query = $query->where('yuebao_item.create_time', '<=', $endTime);
+            }
+            if (isset($params['first_name']) && !empty($params['first_name'])) {
+                $query = $query->where('users.first_name', 'like', "%" . $params['first_name'] . "%");
             }
             $count = $query->count();
             $list = $query
                 ->forPage($page, $limit)
-                ->orderByDesc('create_time')
+                ->orderByDesc('yuebao_item.create_time')
                 ->get();
         } catch (Exception $e) {
             return $this->error(HttpStatus::CUSTOM_ERROR,$e->getMessage());

app/Services/BackflowService.php

@@ -102,20 +102,24 @@ class BackflowService extends BaseService
     {
         $where = [];
         if (isset($search['id']) && !empty($search['id'])) {
-            $where[] = ['id', '=', $search['id']];
+            $where[] = ['backflow.id', '=', $search['id']];
         }
 
         if (isset($search['member_id']) && !empty($search['member_id'])) {
-            $where[] = ['member_id', '=', $search['member_id']];
+            $where[] = ['backflow.member_id', '=', $search['member_id']];
         }
 
         if (isset($search['date']) && !empty($search['date'])) {
-            $where[] = ['date', '=', $search['date']];
+            $where[] = ['backflow.date', '=', $search['date']];
         }
 
 
         if (isset($search['status']) && $search['status'] != '') {
-            $where[] = ['status', '=', $search['status']];
+            $where[] = ['backflow.status', '=', $search['status']];
+        }
+        
+        if (!empty($search['first_name'])) {
+            $where[] = ['users.first_name','like', '%'.$search['first_name'].'%'];
         }
 
         return $where;
@@ -125,17 +129,11 @@ class BackflowService extends BaseService
     {
 
         $date = Carbon::now('Asia/Shanghai')->format('Y-m');
-        $query = static::$MODEL::where(static::getWhere($search));
-        $query->where('date', '<', $date);
-        if (isset($search['username']) && !empty($search['username'])) {
-            $username = $search['username'];
-            $query = $query->whereHas('user', function ($query1) use ($username) {
-                $query1->where('username', $username);
-            });
-        }
+        $query = static::$MODEL::join('users', 'users.member_id', '=', 'backflow.member_id')
+                ->where(static::getWhere($search))
+                ->where('backflow.date', '<', $date);
 
-        $paginator = $query
-            ->with(['user'])->orderByDesc('date')->orderBy('status')
+        $paginator = $query->select("backflow.*", "users.first_name","users.admin_note as user_admin_note")->orderByDesc('date')->orderBy('status')
             ->paginate($search['limit']);
 
 //        $count = $query->count();

app/Services/BalanceLogService.php

@@ -61,32 +61,35 @@ class BalanceLogService extends BaseService
     {
         $where = [];
         if (isset($search['coin']) && !empty($search['coin'])) {
-            $where[] = ['coin', '=', $search['coin']];
+            $where[] = ['balance_logs.coin', '=', $search['coin']];
         }
         if (isset($search['net']) && !empty($search['net'])) {
-            $where[] = ['net', '=', $search['net']];
+            $where[] = ['balance_logs.net', '=', $search['net']];
         }
         if (isset($search['address']) && !empty($search['address'])) {
-            $where[] = ['address', '=', $search['address']];
+            $where[] = ['balance_logs.address', '=', $search['address']];
         }
         if (isset($search['id']) && !empty($search['id'])) {
-            $where[] = ['id', '=', $search['id']];
+            $where[] = ['balance_logs.id', '=', $search['id']];
         }
         if (isset($search['member_id']) && !empty($search['member_id'])) {
-            $where[] = ['member_id', '=', $search['member_id']];
+            $where[] = ['balance_logs.member_id', '=', $search['member_id']];
         }
 
         if (isset($search['type']) && !empty($search['type'])) {
-            $where[] = ['type', '=', $search['type']];
+            $where[] = ['balance_logs.type', '=', $search['type']];
         }
         
         if (isset($search['change_type']) && !empty($search['change_type'])) {
-            $where[] = ['change_type', '=', $search['change_type']];
+            $where[] = ['balance_logs.change_type', '=', $search['change_type']];
         }
 
         if (isset($search['start_time']) && !empty($search['start_time'])) {
-            $where[] = ['created_at', '>=', "{$search['start_time']} 00:00:00"];
-            $where[] = ['created_at', '<=', "{$search['end_time']} 23:59:59"];
+            $where[] = ['balance_logs.created_at', '>=', "{$search['start_time']} 00:00:00"];
+            $where[] = ['balance_logs.created_at', '<=', "{$search['end_time']} 23:59:59"];
+        }
+        if (isset($search['first_name']) && !empty($search['first_name'])) {
+            $where[] = ['users.first_name', 'like', "%" . $search['first_name'] . "%"];
         }
 
         return $where;

app/Services/PaymentOrderService.php

@@ -106,7 +106,7 @@ class PaymentOrderService extends BaseService
         $limit = isset($search['limit']) ? $search['limit'] : 15;
         $paginator = static::$MODEL::where(self::getWhere($search))
             ->join('users', 'users.member_id', '=', 'payment_orders.member_id')
-            ->select("payment_orders.*", "users.first_name") // 提前查好需要的字段
+            ->select("payment_orders.*", "users.first_name","users.admin_note as user_admin_note") // 提前查好需要的字段
             ->orderByDesc('payment_orders.created_at')
             ->paginate($limit);
 

app/Services/WithdrawService.php

@@ -127,15 +127,18 @@ class WithdrawService
     {
         $where = [];
         if (isset($search['id']) && !empty($search['id'])) {
-            $where[] = ['id', '=', $search['id']];
+            $where[] = ['withdraws.id', '=', $search['id']];
         }
 
 
         if (isset($search['member_id']) && !empty($search['member_id'])) {
-            $where[] = ['member_id', '=', $search['member_id']];
+            $where[] = ['withdraws.member_id', '=', $search['member_id']];
         }
         if (isset($search['status']) && $search['status'] != '') {
-            $where[] = ['status', '=', $search['status']];
+            $where[] = ['withdraws.status', '=', $search['status']];
+        }
+        if (isset($search['first_name']) && !empty($search['first_name'])) {
+            $where[] = ['users.first_name', 'like', "%" . $search['first_name'] . "%"];
         }
         return $where;
     }