[智价云] 临时关闭时间校验

app/Http/Controllers/Manager/Statistics/BasicPanel.php

@@ -123,7 +123,7 @@ class BasicPanel extends Controller
         $start_time = $start_time_string ? strtotime($start_time_string . ' 00:00:00') : $yesterdayStart;
         $end_time = $end_time_string ? strtotime($end_time_string . ' 23:59:59') : $yesterdayEnd;
         $todayStart = Carbon::today()->startOfDay()->getTimestamp(); // 今天开始时间 00:00:00
-        if ($start_time > $todayStart || $end_time > $todayStart) return  json_send(['code' => 'error', 'msg' => '不支持查询今天或以后时间', 'data' => '']);
+        // if ($start_time > $todayStart || $end_time > $todayStart) return  json_send(['code' => 'error', 'msg' => '不支持查询今天或以后时间', 'data' => '']);
         // 时间条件
         $map  = [];
         if ($start_time) $map[] = ['insert_time', '>=', $start_time];
@@ -154,8 +154,8 @@ class BasicPanel extends Controller
             $violationProductModel = $violationProductModel->whereIn('platform_id', $platform);
         }
         $result = $violationProductModel->where($map)->where('status', 0)
-            ->select(['company_name', DB::raw('count(product_name) as count')])->distinct('product_name')->orderby('count', 'desc')
-            ->groupby('company_name')->paginate($limit);
+            ->select(['product_name', DB::raw('count(product_name) as count')])->distinct('product_name')->orderby('count', 'desc')
+            ->groupby('product_name')->paginate($limit);
         return  json_send(['code' => 'success', 'msg' => '获取成功', 'data' => $result]);
     }
 
@@ -180,7 +180,7 @@ class BasicPanel extends Controller
         $start_time = $start_time_string ? strtotime($start_time_string . ' 00:00:00') : $yesterdayStart;
         $end_time = $end_time_string ? strtotime($end_time_string . ' 23:59:59') : $yesterdayEnd;
         $todayStart = Carbon::today()->startOfDay()->getTimestamp(); // 今天开始时间 00:00:00
-        if ($start_time > $todayStart || $end_time > $todayStart) return  json_send(['code' => 'error', 'msg' => '不支持查询今天或以后时间', 'data' => '']);
+        // if ($start_time > $todayStart || $end_time > $todayStart) return  json_send(['code' => 'error', 'msg' => '不支持查询今天或以后时间', 'data' => '']);
         // 时间条件
         $map  = [];
         if ($start_time) $map[] = ['insert_time', '>=', $start_time];
@@ -220,7 +220,7 @@ class BasicPanel extends Controller
         $start_time = $start_time_string ? strtotime($start_time_string . ' 00:00:00') : $yesterdayStart;
         $end_time = $end_time_string ? strtotime($end_time_string . ' 23:59:59') : $yesterdayEnd;
         $todayStart = Carbon::today()->startOfDay()->getTimestamp(); // 今天开始时间 00:00:00
-        if ($start_time > $todayStart || $end_time > $todayStart) return  json_send(['code' => 'error', 'msg' => '不支持查询今天或以后时间', 'data' => '']);
+        // if ($start_time > $todayStart || $end_time > $todayStart) return  json_send(['code' => 'error', 'msg' => '不支持查询今天或以后时间', 'data' => '']);
         // 时间条件
         $map  = [];
         if ($start_time) $map[] = ['insert_time', '>=', $start_time];
@@ -232,8 +232,8 @@ class BasicPanel extends Controller
             $map[] = ['company_id', '=', $admin_company_id];
         }
         $result = $LowPriceGoodsModel->where($map)->where('status', 0)
-            ->select(['company_name', DB::raw('count(product_name) as count')])->distinct('product_name')->orderby('count', 'desc')
-            ->groupby('company_name')->paginate($limit);
+            ->select(['product_name', DB::raw('count(product_name) as count')])->distinct('product_name')->orderby('count', 'desc')
+            ->groupby('product_name')->paginate($limit);
         return  json_send(['code' => 'success', 'msg' => '获取成功', 'data' => $result]);
     }
 
@@ -258,7 +258,7 @@ class BasicPanel extends Controller
         $start_time = $start_time_string ? strtotime($start_time_string . ' 00:00:00') : $yesterdayStart;
         $end_time = $end_time_string ? strtotime($end_time_string . ' 23:59:59') : $yesterdayEnd;
         $todayStart = Carbon::today()->startOfDay()->getTimestamp(); // 今天开始时间 00:00:00
-        if ($start_time > $todayStart || $end_time > $todayStart) return  json_send(['code' => 'error', 'msg' => '不支持查询今天或以后时间', 'data' => '']);
+        // if ($start_time > $todayStart || $end_time > $todayStart) return  json_send(['code' => 'error', 'msg' => '不支持查询今天或以后时间', 'data' => '']);
         // 时间条件
         $map  = [];
         if ($start_time) $map[] = ['insert_time', '>=', $start_time];