合并分支 'lyh-server' 到 'master'

gx



查看合并请求 !1634

@@ -98,6 +98,7 @@ class GoogleSearchKeyword extends Command
         $saveData = [];
         $saveData = [];
         $clicksNum = array_sum(array_column($data, 'clicks'));
         $clicksNum = array_sum(array_column($data, 'clicks'));
         $impressionsNum = array_sum(array_column($data, 'impressions'));
         $impressionsNum = array_sum(array_column($data, 'impressions'));
+
         foreach ($data as $val){
         foreach ($data as $val){
             $saveData[] = [
             $saveData[] = [
                 'date'=>date('Y-m-d'),
                 'date'=>date('Y-m-d'),
@@ -105,9 +106,9 @@ class GoogleSearchKeyword extends Command
                 'type'=>$type,
                 'type'=>$type,
                 'keys'=>$val['keys'][0],
                 'keys'=>$val['keys'][0],
                 'clicks'=>$val['clicks'],
                 'clicks'=>$val['clicks'],
-                'click_rate'=>number_format($val['clicks'] / ($clicksNum ?? 1), 2),
+                'click_rate'=>number_format($val['clicks'] / (($clicksNum == 0) ? 1 : 0), 2),
                 'impressions'=>$val['impressions'],
                 'impressions'=>$val['impressions'],
-                'impressions_rate'=>number_format($val['impressions'] / ($impressionsNum ?? 1), 2),
+                'impressions_rate'=>number_format($val['impressions'] / (($impressionsNum == 0) ? 1 : 0), 2),
                 'ctr'=>$val['ctr'],
                 'ctr'=>$val['ctr'],
                 'position'=>$val['position'],
                 'position'=>$val['position'],
             ];
             ];