[智价云] 清洗更新

app/Jobs/Manager/Process/LowPriceGoodsJobs.php

@@ -75,9 +75,9 @@ class LowPriceGoodsJobs implements ShouldQueue
             $list_data = $list_config_data['data'];
             foreach ($list_data as $key => $value) {
                 $company_data = $LowPriceGoodsCompanyModel->where('washconfig_lowprice_product_company.lowprice_product_logid', $value['id'])
-                    ->where('washconfig_violation_store.store_type', 1)
-                    ->join('washconfig_violation_store', 'washconfig_violation_store.id', '=', 'washconfig_lowprice_product_company.company_id')
-                    ->select(['washconfig_violation_store.id', 'washconfig_violation_store.social_credit_code', 'washconfig_lowprice_product_company.company_id'])->get()->toArray();
+                    ->where('washconfig_violation_company.company_type', 1)
+                    ->join('washconfig_violation_company', 'washconfig_violation_company.id', '=', 'washconfig_lowprice_product_company.company_id')
+                    ->select(['washconfig_violation_company.id', 'washconfig_violation_company.social_credit_code', 'washconfig_lowprice_product_company.company_id'])->get()->toArray();
                 $social_credit_code = !empty($company_data) ? array_column($company_data, 'social_credit_code') : '';
                 $message_data = [
                     'company_id' => $value['company_id'],
@@ -98,8 +98,8 @@ class LowPriceGoodsJobs implements ShouldQueue
                     'item_totle_page' => $totle_page,
                     'item_now_page' => $page,
                 ];
-                LowPriceGoodsDataJobs::dispatch($message_data);
-                // LowPriceGoodsDataJobs::dispatchSync($message_data);
+                // LowPriceGoodsDataJobs::dispatch($message_data);
+                LowPriceGoodsDataJobs::dispatchSync($message_data);
             }
             $now_message_data = [
                 'limit' => $limit,

app/Jobs/Manager/Process/ViolationProductJobs.php

@@ -73,9 +73,9 @@ class ViolationProductJobs implements ShouldQueue
             $list_data = $list_config_data['data'];
             foreach ($list_data as $key => $value) {
                 $company_data = $ViolationProductCompanyModel->where('washconfig_violation_product_company.violation_product_logid', $value['id'])
-                    ->where('washconfig_violation_store.store_type', 1)
-                    ->join('washconfig_violation_store', 'washconfig_violation_store.id', '=', 'washconfig_violation_product_company.company_id')
-                    ->select(['washconfig_violation_store.id', 'washconfig_violation_store.social_credit_code', 'washconfig_violation_product_company.company_id'])->get()->toArray();
+                    ->where('washconfig_violation_company.company_type', 1)
+                    ->join('washconfig_violation_company', 'washconfig_violation_company.id', '=', 'washconfig_violation_product_company.company_id')
+                    ->select(['washconfig_violation_company.id', 'washconfig_violation_company.social_credit_code', 'washconfig_violation_product_company.company_id'])->get()->toArray();
                 $social_credit_code = !empty($company_data) ? array_column($company_data, 'social_credit_code') : '';
                 $message_data = [
                     'company_id' => $value['company_id'],

app/Jobs/Manager/Process/ViolationStoreDataJobs.php

@@ -74,7 +74,7 @@ class ViolationStoreDataJobs implements ShouldQueue
         $store_name = $message_data['store_name']; //店铺名称
         $company_name = $message_data['company_name']; //公司名称
         $social_credit_code = $message_data['social_credit_code']; //社会信用代码
-        $store_type = $message_data['store_type']; //公司类型:1=黑名单2=白名单
+        $company_type = $message_data['company_type']; //公司类型:1=黑名单2=白名单
         $executeLog_id = $message_data['executeLog_id'];
         $company_category_name = $message_data['company_category_name']; //公司类别名称
         $specify_responsible_person = $message_data['specify_responsible_person']; //指派责任人 0=开启 1=关闭

app/Jobs/Manager/Process/ViolationStoreJobs.php

@@ -53,10 +53,10 @@ class ViolationStoreJobs implements ShouldQueue
                 $insert_data =['company_id'=>$company_id,'name' =>'违规挂网店铺', 'code' => 'ViolationStoreJobs', 'admin_id' => $admin_id,'is_admin' => $is_admin];
                 $executeLog_id=$ExecuteLogModel->addExecuteLog_content($insert_data);
             }
-            $ViolationStoreModel = $ViolationStoreModel->leftjoin('washconfig_company_category', 'washconfig_company_category.id', '=', 'washconfig_violation_store.category_id')
-                ->where('washconfig_violation_store.status', 0)->where('store_type', 1)->select(['washconfig_violation_store.*','washconfig_company_category.name as category_name']);
+            $ViolationStoreModel = $ViolationStoreModel->leftjoin('washconfig_company_category', 'washconfig_company_category.id', '=', 'washconfig_violation_company.category_id')
+                ->where('washconfig_violation_company.status', 0)->where('company_type', 1)->select(['washconfig_violation_company.*','washconfig_company_category.name as category_name']);
             if($company_id){
-                $ViolationStoreModel = $ViolationStoreModel->where('washconfig_violation_store.company_id', $company_id);
+                $ViolationStoreModel = $ViolationStoreModel->where('washconfig_violation_company.company_id', $company_id);
             }
             $totle_page = 0;
             $list_config_data = $ViolationStoreModel->paginate($limit, ['*'], 'page', $page)->toarray();
@@ -74,7 +74,7 @@ class ViolationStoreJobs implements ShouldQueue
                     'id' => $value['id'],
                     'platform' => $value['platform'],
                     'store_name'=> $value['store_name'],
-                    'store_type' => $value['store_type'],
+                    'company_type' => $value['company_type'],
                     'company_name' => $value['company_name'],
                     'social_credit_code' => $value['social_credit_code'],
                     'executeLog_id' => $executeLog_id,