筛选

app/Http/Controllers/admin/LhcOrder.php

@@ -39,6 +39,8 @@ class LhcOrder extends Controller
                 'type' => ['nullable', 'integer'],
                 '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', 'after_or_equal:start_time'],
+                // 注册来源：users.from（-1 tg / 0 后台客服 / 1 真实用户 / 2 虚拟用户）
+                'from' => ['nullable', 'integer', 'in:-1,0,1,2'],
             ]);
             $page = request()->input('page', 1);
             $limit = request()->input('limit', 15);
@@ -86,8 +88,17 @@ class LhcOrder extends Controller
             if (!empty($params['end_time'])) {
                 $query = $query->where('lhc_order.created_at', '<=', strtotime($params['end_time'] . ' 23:59:59'));
             }
+            // from=0 合法，不能用 empty()
+            if (array_key_exists('from', $params) && $params['from'] !== null && $params['from'] !== '') {
+                $query = $query->where('users.from', (int)$params['from']);
+            }
             $count = $query->count();
-            $list = $query->select('lhc_order.*','users.first_name','users.member_id')
+            $list = $query->select(
+                    'lhc_order.*',
+                    'users.first_name',
+                    'users.member_id',
+                    'users.from as user_from'
+                )
                 ->forPage($page, $limit)
                 ->orderByDesc('lhc_order.created_at')
                 ->get();

app/Http/Controllers/admin/Order.php

@@ -94,6 +94,8 @@ class Order extends Controller
                 'league' => ['nullable'],
                 'home_team' => ['nullable'],
                 'guest_team' => ['nullable'],
+                // 注册来源：users.from（-1 tg / 0 后台客服 / 1 真实用户 / 2 虚拟用户）
+                'from' => ['nullable', 'integer', 'in:-1,0,1,2'],
             ]);
             $page = request()->input('page', 1);
             $limit = request()->input('limit', 15);
@@ -154,11 +156,15 @@ class Order extends Controller
             if (!empty($params['first_name'])) {
                 $query = $query->where('users.first_name', 'like', "%{$params['first_name']}%");
             }
+            // from=0 合法，不能用 empty()
+            if (array_key_exists('from', $params) && $params['from'] !== null && $params['from'] !== '') {
+                $query = $query->where('users.from', (int)$params['from']);
+            }
             
             $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',
-                    'users.member_id','users.first_name'
+                    'users.member_id','users.first_name','users.from as user_from'
                 ])
                 ->forPage($page, $limit)
                 ->orderByDesc('sport_order.create_time')
@@ -167,7 +173,6 @@ class Order extends Controller
                 $item['odd_name'] = Sport::doOddName($item['odd_name']);
                 $item['odd_value'] = Sport::doOddValue($item['odd_value']);
                 $item['odd'] = formatDecimal($item['odd'], 2);
-                
             }
         } catch (Exception $e) {
             return $this->error(HttpStatus::CUSTOM_ERROR,$e->getMessage());