Merge branch 'yang_control_fix' of ssh://was.baoshi56.com:10022/var/git/bswas

 Conflicts:

	app/Http/Controllers/TestController.php

app/Http/Controllers/TestController.php

@@ -1531,4 +1531,16 @@ TEXT;
         array_push($headers, "Content-Type".":"."application/json; charset=UTF-8");
         dd($headers);
     }
+
+    public function order_counting_records_cache_clear()
+    {
+        $owner_ids = Owner::query()->select('id')->pluck('id');
+        $dayClears = now()->subYear()->daysUntil(now());
+        foreach ($dayClears as $day) {
+            foreach ($owner_ids as $owner_id) {
+                $key = "order_counting_records_{$day->toDateString()}_{$owner_id}_日";
+                Cache::forget($key);
+            }
+        }
+    }
 }

app/Services/NewOrderCountingRecordService.php

@@ -475,8 +475,10 @@ class NewOrderCountingRecordService
     private function getTtl($dateStr, $unit)
     {
         if ($this->isNotCurrentDate($dateStr, $unit)) {
+            LogService::log('NewOrderCountingRecordService', '缓存设置为永久', $dateStr);
             $ttl = config('cache.expirations.forever');//非当前日期的缓存为永久
         } else {
+            LogService::log('NewOrderCountingRecordService', '缓存设置为临时', $dateStr);
             $ttl = config('cache.expirations.orderCountingRecord');//当前日期缓存为1800s
         }
         return $ttl;