合并分支 'akun' 到 'master'

Akun



查看合并请求 !2913

@@ -160,7 +160,7 @@ class InquiryForwardLogic extends BaseLogic
             $num = 0;
             $num = 0;
             $now = date('Y-m-d H:i:s');
             $now = date('Y-m-d H:i:s');
 
 
-            foreach ($forward_url as $key=>$url) {
+            foreach ($forward_url as $key => $url) {
                 $url = trim($url);
                 $url = trim($url);
                 $domain_array = parse_url($url);
                 $domain_array = parse_url($url);
                 $website = $domain_array['host'] ?? '';
                 $website = $domain_array['host'] ?? '';
@@ -482,7 +482,8 @@ class InquiryForwardLogic extends BaseLogic
             $data[$s_date] = [
             $data[$s_date] = [
                 'total' => 0,
                 'total' => 0,
                 'invalid' => 0,
                 'invalid' => 0,
-                'init' => 0
+                'init' => 0,
+                'finish' => 0
             ];
             ];
             $s_date = date('Y-m-d', strtotime($s_date . ' + 1 day'));
             $s_date = date('Y-m-d', strtotime($s_date . ' + 1 day'));
         }
         }
@@ -495,10 +496,10 @@ class InquiryForwardLogic extends BaseLogic
 
 
             if ($value['status'] == InquiryInfo::STATUS_INVALID) {
             if ($value['status'] == InquiryInfo::STATUS_INVALID) {
                 $data[$inquiry_date]['invalid'] += 1;
                 $data[$inquiry_date]['invalid'] += 1;
-            }
-
-            if ($value['status'] == InquiryInfo::STATUS_INIT) {
+            } elseif ($value['status'] == InquiryInfo::STATUS_INIT) {
                 $data[$inquiry_date]['init'] += 1;
                 $data[$inquiry_date]['init'] += 1;
+            } else {
+                $data[$inquiry_date]['finish'] += 1;
             }
             }
         }
         }