订单量趋势 解决首次查询vue报错的问题

app/Services/OrderCountingRecordService.php

@@ -28,16 +28,10 @@ class OrderCountingRecordService
         $resultByCache = $this->getByCache($start, $end, $ownerIds, $unit);
         if (!($resultByCache['unExistingOrders'])) return $resultByCache['resultOrders'];
         $resultByOrderCountingRecords = $this->getByDatabase($resultByCache['unExistingOrders'], $unit);
-        if (!($resultByOrderCountingRecords['unExistingOrders'])) return $resultByOrderCountingRecords['resultOrders'];
-        $resultByOrders = $this->createByDatabase($resultByOrderCountingRecords['unExistingOrders'], $unit);
-        $result = collect();
-        $result = $result->merge($resultByCache['resultOrders']);
-        var_dump($result->count());
-        $result = $result->merge($resultByOrderCountingRecords['resultOrders']);
-        var_dump($result->count());
-        $result = $result->merge($resultByOrders['resultOrders']);
-        var_dump($result->count());
-        return $result;
+        $this->createByDatabase($resultByOrderCountingRecords['unExistingOrders'], $unit);
+        $this->getByDatabase($resultByCache['unExistingOrders'], $unit);
+        $resultByCache = $this->getByCache($start, $end, $ownerIds, $unit);
+        return $resultByCache['resultOrders'];
     }
 
     public function getByCache($start, $end, $ownerIds = null, $unit = '日')
@@ -123,7 +117,7 @@ class OrderCountingRecordService
         return ['resultOrders' => $result];
     }
 
-    public function orderCountingRecords($start = '2020-10-20', $end = '2020-11-07', $unit = '日')
+    public function orderCountingRecords($start = '2020-10-1', $end = '2020-11-09', $unit = '日')
     {
         $orders = $this->get($start, $end, null, $unit);
         $dataList = collect();
@@ -132,7 +126,7 @@ class OrderCountingRecordService
                 return $sum + $item->amount;
             }, 0);
             $date_target = $items[0]->date_target;
-            if ($unit=='周') {
+            if ($unit == '周') {
                 $date_target = (new DateTime())->setISODate(Str::of($date_target)->explode('-')[0], Str::of($date_target)->explode('-')[1])->format('yy-m-d');
             }
             $dataList->push([