[智价云] 统计更新

app/Http/Controllers/Manager/Statistics/BasicPanel.php

@@ -128,7 +128,8 @@ class BasicPanel extends Controller
             ->where('company_id', $select_company_id)
             ->where($map)
             ->get()->toarray();
-        $collect_b_product_list =[];
+        $collect_b_product_list =[];//按品规
+        $collect_b_product_name_list =[];//按商品名称
         if(!empty($collect_b_product_list_data)){
             foreach ($collect_b_product_list_data as $key => $value) {
                 $collect_b_product_name =trim($value['product_brand'].'_'. $value['product_name']);
@@ -140,8 +141,10 @@ class BasicPanel extends Controller
                 }
                 //去重$collect_b_product_list[$collect_b_product_name]数据
                 $collect_b_product_list[$collect_b_product_name] =count($collect_b_product_list[$collect_b_product_name]) > 0 ? array_unique($collect_b_product_list[$collect_b_product_name]):[];
+                $collect_b_product_name_list[$value['product_name']] = 1;
             }
         }
+        $collect_b_product_name_count = count($collect_b_product_name_list);
         //计算B端品规数量
         if(!empty($collect_b_product_list)){
             foreach ($collect_b_product_list as $key => $value) {
@@ -162,6 +165,7 @@ class BasicPanel extends Controller
             ->where($map)
             ->get()->toarray();
         $collect_c_product_list =[];
+        $collect_c_product_name_list =[];//按商品名称
         if(!empty($collect_c_product_list_data)){
             foreach ($collect_c_product_list_data as $key => $value) {
                 $collect_c_product_name = trim($value['product_brand'].'_'. $value['product_name']);
@@ -173,8 +177,10 @@ class BasicPanel extends Controller
                 }
                 //去重$collect_c_product_list[$collect_c_product_name]数据
                 $collect_c_product_list[$collect_c_product_name] = count($collect_c_product_list[$collect_c_product_name]) > 0 ? array_unique($collect_c_product_list[$collect_c_product_name]):[];
+                $collect_c_product_name_list[$value['product_name']] = 1;
             }
         }
+        $collect_c_product_name_count = count($collect_c_product_name_list);
         //计算C端品规数量
         if(!empty($collect_c_product_list)){
             foreach ($collect_c_product_list as $key => $value) {
@@ -205,7 +211,7 @@ class BasicPanel extends Controller
             foreach ($collect_b_product_list as $collect_b_product_key => $collect_b_product_values) {
                 if(count($value)){
                     foreach ($collect_b_product_values as $k => $collect_b_product_value) {
-                        $product_specs_name = $collect_b_product_key .'_'. $collect_b_product_value;
+                        $product_specs_name = $collect_b_product_key .'_'. $collect_b_product_value;//按品规数量去重
                         $collect_product_list_data[$product_specs_name] ='1';
                     }
                 }else{
@@ -213,16 +219,38 @@ class BasicPanel extends Controller
                 }
             }
         }
-        //显示去重后的数量
+        //合并去重C端商品名称，以及B端商品名称
+        $collect_product_name_list_data =[];
+        if(count($collect_c_product_name_list) > 0){
+            foreach ($collect_c_product_name_list as $collect_c_product_name_key => $collect_c_product_name_value) {
+               $collect_product_name_list_data[$collect_c_product_name_key] = 1;
+            }
+        }
+        if(count($collect_b_product_name_list) > 0){
+            foreach ($collect_b_product_name_list as $collect_b_product_name_key => $collect_b_product_name_value) {
+               $collect_product_name_list_data[$collect_b_product_name_key] = 1;
+            }
+        }
+         //显示去重后的商品名称数量
+        $collect_product_name_count = count($collect_product_name_list_data);
+        //显示去重后的商品品规数量
         $collect_totle_product_count = count($collect_product_list_data);
         $result_data = [
-            'collect_b_product_count' => $collect_b_product_count, // B端品规数量
-            'collect_c_product_count' => $collect_c_product_count, // C端品规数量
-            'collect_oto_product_count' => 0, // OTO品规数量
-            'collect_totle_product_count' => $collect_totle_product_count, // 所有终端品规数量
-            'collect_c_product_data' => $collect_c_product_list, // C端品规数据
-            'collect_b_product_data' => $collect_b_product_list, // B端品规数据
-            'collect_product_list_data' => $collect_product_list_data, // 所有终端品规数据
+            'collect_b_product_count' => $collect_b_product_name_count, // B端商品名称数量
+            'collect_c_product_count' => $collect_c_product_name_count, // C端商品名称数量
+            'collect_oto_product_count' => 0, // OTO商品名称数量
+            'collect_totle_product_count' => $collect_product_name_count, // 所有终端商品名称数量
+            'collect_c_product_data' => $collect_c_product_name_list, // C端商品名称数据
+            'collect_b_product_data' => $collect_b_product_name_list, // B端商品名称数据
+            'collect_product_list_data' => $collect_product_name_list_data, // 所有终端商品名称数据
+
+            'collect_b_product_spc_count' => $collect_b_product_count, // B端品规数量
+            'collect_c_product_spc_count' => $collect_c_product_count, // C端品规数量
+            'collect_oto_product_spc_count' => 0, // OTO品规数量
+            'collect_totle_product_spc_count' => $collect_totle_product_count, // 所有终端品规数量
+            'collect_c_product_spc_data' => $collect_c_product_list, // C端品规数据
+            'collect_b_product_spc_data' => $collect_b_product_list, // B端品规数据
+            'collect_product_spc_list_data' => $collect_product_list_data, // 所有终端品规数据
         ];
         return $result_data;
     }