Wesmiler

app/Services/Api/PriceLogService.php

@@ -177,6 +177,7 @@ class PriceLogService extends BaseService
             return $datas;
         }
 
+        $limit = $dateType == 1? 7 : 366;
         $lists = $this->model->where(['status'=>1,'mark'=>1])->where(function($query) use($dateType){
             $curTime = strtotime(date('Y-m-d'));
             if($dateType == 3){
@@ -184,13 +185,13 @@ class PriceLogService extends BaseService
             }else if($dateType == 2){
                 $query->where('date','>=', date('Y-m-01'));
             }else{
-                $query->where('date','>=', date('Y-m-d', $curTime-7* 86400));
+//                $query->where('date','>=', date('Y-m-d', $curTime-7* 86400));
             }
-        })->orderBy('date','asc')->get();
+        })->orderBy('date','asc')->limit($limit)->get();
         $lists = $lists? $lists->toArray() :[];
         $datas = ['titles'=>[],'values'=>[],'rise'=>'0.00'];
         if($lists){
-            $data = end($lists);
+            $data = end($lists); 
             $datas['rise'] = isset($data['price_rise'])? $data['price_rise'] : '0.00';
             foreach ($lists as $val){
                 $datas['titles'][] = date('m.d', strtotime($val['date']));