[智价云] BC端品规统计更新

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

@@ -65,6 +65,9 @@ class BasicPanel extends Controller
             $violationStoreModel = $violationStoreModel->where('company_id', $admin_company_id);
         }
 
+        //获取采集商品数量
+        $collect_statistics_data = $this->get_product_count($start_time, $end_time, $product_name, $is_admin, $company_id, $admin_company_id);
+
         // 低价挂网商品数量查询
         $lowPriceGoodsCount = $lowPriceGoodsModel->where($map)
             ->where('status', 0)
@@ -83,8 +86,7 @@ class BasicPanel extends Controller
             ->groupBy('store_name')
             ->select('store_name')
             ->get()->count();
-        //获取采集商品数量
-        $collect_statistics_data = $this->get_product_count($start_time, $end_time, $product_name, $is_admin, $company_id, $admin_company_id);
+
         $result_data = [
             'low_price_goods_count' => $lowPriceGoodsCount, // 低价挂网商品数量
             'violation_product_count' => $violationProductCount, // 禁止挂网商品数量
@@ -121,18 +123,22 @@ class BasicPanel extends Controller
         //B端：药师帮、1药城、药久久、药易购、药帮忙、熊猫药药
         $collect_b_product_count = 0;
         $collect_b_product_list_data = $ProductTaskModel
-            ->where('platform', 'in', ['0', '5', '6', '7', '8', '9', '10'])//1=淘宝，2=京东，3=拼多多，4=美团，5=药师帮，6=1药城，7=药久久,8=药易购，9=药帮忙，10=熊猫药药11=药房网
+            ->whereIn('platform',['0', '5', '6', '7', '8', '9', '10'])//1=淘宝，2=京东，3=拼多多，4=美团，5=药师帮，6=1药城，7=药久久,8=药易购，9=药帮忙，10=熊猫药药11=药房网
             ->where('company_id', $select_company_id)
             ->where($map)
             ->get()->toarray();
         $collect_b_product_list =[];
         if(!empty($collect_b_product_list_data)){
             foreach ($collect_b_product_list_data as $key => $value) {
-                $collect_b_product_name = $value['product_name'];
+                $collect_b_product_name =trim($value['product_brand'].'_'. $value['product_name']);
                 $collect_b_product_specs = $value['product_specs'] !='' ? explode(',', $value['product_specs']) : [];
-                $collect_b_product_list[$collect_b_product_name][] = $collect_b_product_specs;
+                if(isset($collect_b_product_list[$collect_b_product_name])){
+                    $collect_b_product_list[$collect_b_product_name] = array_merge($collect_b_product_list[$collect_b_product_name],$collect_b_product_specs);
+                }else{
+                    $collect_b_product_list[$collect_b_product_name] = $collect_b_product_specs;
+                }
                 //去重$collect_b_product_list[$collect_b_product_name]数据
-                $collect_b_product_list[$collect_b_product_name] = array_unique($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]):[];
             }
         }
         //计算B端品规数量
@@ -141,22 +147,27 @@ class BasicPanel extends Controller
                 $collect_b_product_count = $collect_b_product_count + count($value);
             }
         }
+       
         //获取C端品规数量
         //C端：美团、拼多多、天猫、京东、药房网
         $collect_c_product_count = 0;
         $collect_c_product_list_data = $ProductTaskModel
-            ->where('platform', 'in', ['0', '1', '2', '3', '4', '11'])//1=淘宝，2=京东，3=拼多多，4=美团，5=药师帮，6=1药城，7=药久久,8=药易购，9=药帮忙，10=熊猫药药11=药房网
+            ->whereIn('platform',['0', '1', '2', '3', '4', '11'])//1=淘宝，2=京东，3=拼多多，4=美团，5=药师帮，6=1药城，7=药久久,8=药易购，9=药帮忙，10=熊猫药药11=药房网
             ->where('company_id', $select_company_id)
             ->where($map)
             ->get()->toarray();
         $collect_c_product_list =[];
         if(!empty($collect_c_product_list_data)){
             foreach ($collect_c_product_list_data as $key => $value) {
-                $collect_c_product_name = $value['product_name'];
+                $collect_c_product_name = trim($value['product_brand'].'_'. $value['product_name']);
                 $collect_c_product_specs = $value['product_specs'] !='' ? explode(',', $value['product_specs']) : [];
-                $collect_c_product_list[$collect_c_product_name][] = $collect_c_product_specs;
+                if(isset($collect_c_product_list[$collect_c_product_name])){
+                    $collect_c_product_list[$collect_c_product_name] = array_merge($collect_c_product_list[$collect_c_product_name],$collect_c_product_specs);
+                }else{
+                    $collect_c_product_list[$collect_c_product_name] = $collect_c_product_specs;
+                }
                 //去重$collect_c_product_list[$collect_c_product_name]数据
-                $collect_c_product_list[$collect_c_product_name] = array_unique($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]):[];
             }
         }
         //计算C端品规数量
@@ -173,6 +184,8 @@ class BasicPanel extends Controller
             '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端品规数据
         ];
         return $result_data;
     }