修复导出没有手机号

app/Exports/Dwbs/UserOrderGoodExport.php

@@ -77,16 +77,19 @@ class UserOrderGoodExport implements FromQuery, WithMapping, WithHeadings, Shoul
     public function query()
     {
         $da = $this->data;
-//        return Ranking::query()->when($da['start_day'], function ($query) use ($da) {
-//            return $query->where('day', '>=', $da['start_day']);
-//        })->when($da['end_day'], function ($query) use ($da) {
-//            return $query->where('day', '<=', $da['end_day']);
-//        })->where('day_type', DayTypeEnum::day)->with('user')->select(['user_id', DB::raw("sum(day_xuefen) as dxf")])->groupBy('user_id')->orderByDesc('dxf')->limit(1);
-        return UserXuefen::query()->when($da['start_day'], function ($query) use ($da) {
-            return $query->where('day', '>=', $da['start_day']);
-        })->when($da['end_day'], function ($query) use ($da) {
-            return $query->where('day', '<=', $da['end_day']);
-        })->with('user')->select(['user_id', DB::raw("sum(xuefen) as dxf")])->groupBy('user_id')->orderByDesc('dxf')->limit($da['limit']);
+        if ($da['end_day'] == date("Y-m-d")) {
+            return UserXuefen::query()->when($da['start_day'], function ($query) use ($da) {
+                return $query->where('day', '>=', $da['start_day']);
+            })->when($da['end_day'], function ($query) use ($da) {
+                return $query->where('day', '<=', $da['end_day']);
+            })->with('user')->select(['user_id', DB::raw("sum(xuefen) as dxf")])->groupBy('user_id')->orderByDesc('dxf')->limit($da['limit']);
+        } else {
+            return Ranking::query()->when($da['start_day'], function ($query) use ($da) {
+                return $query->where('day', '>=', $da['start_day']);
+            })->when($da['end_day'], function ($query) use ($da) {
+                return $query->where('day', '<=', $da['end_day']);
+            })->where('day_type', DayTypeEnum::day)->with('user')->select(['user_id', DB::raw("sum(day_xuefen) as dxf")])->groupBy('user_id')->orderByDesc('dxf')->limit(1);
+        }
     }
 
     public function map($row): array