[智价云] 队列清洗信息更新

app/Jobs/Manager/Process/LowPriceGoodsDataJobs.php

@@ -84,7 +84,7 @@ class LowPriceGoodsDataJobs implements ShouldQueue
         $where[] = ['product_name', 'like', '%' . $product_name . '%'];
         $where[] = ['product_specs', 'like', '%' . $product_specs . '%'];
         $where[] = ['one_box_price', '<', $suggested_price];
-        if ($company_scope == 2) {
+        if ($company_scope == 2 && $social_credit_code !='') {
             $ScrapeDataModel->whereIn('qualification_number', $social_credit_code);
         }
         $product_data_info = $ScrapeDataModel->where($where)->paginate($limit, ['*'], 'page', $page)->toarray();
@@ -113,13 +113,16 @@ class LowPriceGoodsDataJobs implements ShouldQueue
                 'city_id' => $product_data['city_id'],
                 'city_name' => $product_data['city_name'],
                 'area_info' => $product_data['area_info'],
-                'category_name' => $category_name
+                'category_name' => $category_name,
+                'company_category_name' => '',
             ];
             //获取公司绑定责任人信息
-            $company_data = $ViolationStoreModel->where('social_credit_code',$product_data['qualification_number'])->first();
+            $company_data = $ViolationStoreModel->leftjoin('washconfig_company_category', 'washconfig_company_category.id', '=', 'washconfig_violation_store.category_id')
+            ->where('washconfig_violation_store.social_credit_code',$product_data['qualification_number'])->select(['washconfig_violation_store.id','washconfig_company_category.name as category_name'])->first();
             $employee_id_list=[];
             if($company_data){
                 $employee_id_list =$ViolationCompanyMemberModel->where('company_logid',$company_data->id)->pluck('employee_id')->toarray();
+                $insert_product_data['company_category_name'] = $company_data->category_name ? $company_data->category_name : '';
             }
 
             //查询配置的第一责任人

app/Jobs/Manager/Process/ViolationProductDataJobs.php

@@ -109,13 +109,16 @@ class ViolationProductDataJobs implements ShouldQueue
                 'city_id' => $product_data['city_id'],
                 'city_name' => $product_data['city_name'],
                 'area_info' => $product_data['area_info'],
-                'category_name' => $category_name
+                'category_name' => $category_name,
+                'company_category_name' => '',
             ];
             //获取公司绑定责任人信息
-            $company_data = $ViolationStoreModel->where('social_credit_code',$product_data['qualification_number'])->first();
+            $company_data = $ViolationStoreModel->leftjoin('washconfig_company_category', 'washconfig_company_category.id', '=', 'washconfig_violation_store.category_id')
+            ->where('washconfig_violation_store.social_credit_code',$product_data['qualification_number'])->select(['washconfig_violation_store.id','washconfig_company_category.name as category_name'])->first();
             $employee_id_list=[];
             if($company_data){
                 $employee_id_list =$ViolationCompanyMemberModel->where('company_logid',$company_data->id)->pluck('employee_id')->toarray();
+                $insert_product_data['company_category_name'] = $company_data->category_name ? $company_data->category_name : '';
             }
             //查询配置的第一责任人
             $where_query1 =[];

app/Jobs/Manager/Process/ViolationStoreDataJobs.php

@@ -99,6 +99,7 @@ class ViolationStoreDataJobs implements ShouldQueue
                 'city_id' => $product_data['city_id'],
                 'city_name' => $product_data['city_name'],
                 'area_info' => $product_data['area_info'],
+                'company_category_name' => '',
             ];
             //获取公司绑定责任人信息
             $company_data = $ViolationStoreModel->where('social_credit_code',$product_data['qualification_number'])->first();

app/Models/Manager/Process/LowPriceGoods.php

@@ -97,9 +97,11 @@ class LowPriceGoods extends Model
                 'store_name'    => $data['store_name'],
                 'source_responsible_person'    => $data['source_responsible_person'] ? ','.$data['source_responsible_person'].',':'',
                 'category_name' => $data['category_name'],
+                'company_category_name' => $data['company_category_name'],
                 'processing_status' => '1',
                 'insert_time' => time(),
             ];
+            
             $LowPriceGoods_id = $this->insertGetId($insert_data);
             $first_responsible_persons =$data['first_responsible_person'] !=''? explode(',', $data['first_responsible_person']):[];
             $first_responsible_person_data=[];

app/Models/Manager/Process/ViolationProduct.php

@@ -92,6 +92,7 @@ class ViolationProduct extends Model
                 'store_name'    => $data['store_name'],
                 'source_responsible_person'    => $data['source_responsible_person'] ? ','.$data['source_responsible_person'].',':'',
                 'category_name' => $data['category_name'],
+                'company_category_name' => $data['company_category_name'],
                 'processing_status' => '1',
                 'insert_time' => time(),
             ];

app/Models/Manager/Process/ViolationStore.php

@@ -86,6 +86,7 @@ class ViolationStore extends Model
                 'link_url'    => $data['link_url'],
                 'store_name'    => $data['store_name'],
                 'source_responsible_person'    => $data['source_responsible_person'] ? ','.$data['source_responsible_person'].',':'',
+                'company_category_name' => $data['company_category_name'],
                 'processing_status' => '1',
                 'insert_time' => time(),
             ];