Merge branch 'clear_collect'

app/Console/Commands/DailyTask.php

@@ -6,8 +6,9 @@ use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
 use App\Jobs\Manager\Process\LowPriceGoodsJobs;
 use App\Jobs\Manager\Process\ViolationProductJobs;
-use App\Jobs\Manager\Process\ViolationStoreJobs;
+use App\Jobs\Manager\Process\ViolationCompanyJobs;
 use App\Models\Manager\External\Company as CompanyModel;
+use App\Jobs\Manager\Process\ViolationStoreJobs;
 
 /**
  * 定时清洗采集的商品数据
@@ -50,16 +51,18 @@ class DailyTask extends Command
                 LowPriceGoodsJobs::dispatch($message_data);
                 //执行违规商品数据清洗任务
                 ViolationProductJobs::dispatch($message_data);
-                //执行违规门店数据清洗任务
+                //执行违规公司数据清洗任务
+                ViolationCompanyJobs::dispatch($message_data);
+                //执行违规店铺数据清洗任务
                 ViolationStoreJobs::dispatch($message_data);
             }
             // $message_data = ['page' => '1', 'limit' => '50'];
-            // //执行低价挂网商品数据清洗任务
+            // 执行低价挂网商品数据清洗任务
             // LowPriceGoodsJobs::dispatch($message_data);
-            // //执行违规商品数据清洗任务
+            // 执行违规商品数据清洗任务
             // ViolationProductJobs::dispatch($message_data);
-            // //执行违规门店数据清洗任务
-            // ViolationStoreJobs::dispatch($message_data);
+            // 执行违规公司数据清洗任务
+            // ViolationCompanyJobs::dispatch($message_data);
             // 示例：记录日志
             $this->info('每日任务执行完成！');
             return Command::SUCCESS;

app/Console/Kernel.php

@@ -24,10 +24,7 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        // $schedule->command('inspire')->hourly();
-        // 每天00:01执行
         $schedule->command('task:daily')
-            ->dailyAt('00:01')
             ->timezone('Asia/Shanghai') // 设置时区，可选
             ->runInBackground() // 在后台运行，可选
             ->withoutOverlapping() // 防止任务重叠执行

app/Http/Controllers/Manager/Collect/Product.php

@@ -47,7 +47,7 @@ class Product extends Controller
         if (is_numeric($platforms) || $platforms) {
             $ProductModel = $ProductModel
                 ->where(function ($query) use ($platforms) {
-                    $platforms = explode(',',$platforms);
+                    $platforms = explode(',', $platforms);
                     foreach ($platforms as $platform) {
                         $query->orWhereRaw("FIND_IN_SET(?, platform)", [$platform]);
                     }
@@ -255,7 +255,7 @@ class Product extends Controller
         if ($all_data['sampling_end_time']  && $all_data['sampling_end_time'] < time()) return json_send(['code' => 'error', 'msg' => '采集结束时间必须大于当前时间']);
 
         $platform_string = $all_data['platform'];
-        if(empty($platform_string)) return json_send(['code' => 'error', 'msg' => '平台不能为空']);
+        if (empty($platform_string)) return json_send(['code' => 'error', 'msg' => '平台不能为空']);
         $enable_full_quantity = request('enable_full_quantity', 0); //全量，0启用，1禁用
         $all_data['enable_full_quantity'] = $enable_full_quantity;
         if (trim($product_keyword) != '') {
@@ -264,12 +264,12 @@ class Product extends Controller
                 return json_send(['code' => 'error', 'msg' => '商品关键词不能超过5个']);
             }
         }
-        if($enable_full_quantity == 1 && $all_data['product_specs'] == ''){
+        if ($enable_full_quantity == 1 && $all_data['product_specs'] == '') {
             return json_send(['code' => 'error', 'msg' => '非全量采集，商品规格不能为空']);
         }
         //查询是否存在
         $map = ['product_name' => $all_data['product_name']];
-        if($product_brand != '') $map['product_brand'] = $product_brand;
+        if ($product_brand != '') $map['product_brand'] = $product_brand;
         if ($is_admin != 1 && $company_id != 0) {
             $map['company_id'] = $company_id;
             $all_data['company_id'] = $company_id;
@@ -284,14 +284,14 @@ class Product extends Controller
             $product_specs = $product_specs_tring ?  explode(',', $product_specs_tring) : '';
             $product_specs = $product_specs ? array_unique($product_specs) : '';
             //继续校平台是否存在
-           
+
             $platforms = $platform_string ?  explode(',', $platform_string) : '';
             $platforms = $platforms ? array_unique($platforms) : '';
 
             $platform_data = $ProductModel->platform_index_data();
-            $map_where = ['product_name' => $all_data['product_name'],'status'=>'0','company_id'=> $all_data['company_id']];
+            $map_where = ['product_name' => $all_data['product_name'], 'status' => '0', 'company_id' => $all_data['company_id']];
             if ($product_brand != '') $map_where['product_brand'] = $product_brand;
-            if (!empty($platforms) && $platforms != '')  {
+            if (!empty($platforms) && $platforms != '') {
                 foreach ($platforms as $platform) {
                     $product_specs_log = $ProductModel
                         ->whereRaw("FIND_IN_SET(?, platform)", [$platform])
@@ -313,7 +313,6 @@ class Product extends Controller
                     }
                 }
             }
-            
         }
         // 写入数据表
         $result     =  $ProductModel->addProduct($all_data);
@@ -365,7 +364,7 @@ class Product extends Controller
         if ($all_data['sampling_end_time']  && $all_data['sampling_end_time'] < time()) return json_send(['code' => 'error', 'msg' => '采集结束时间必须大于当前时间']);
 
         $platform_string = $all_data['platform'];
-        if(empty($platform_string)) return json_send(['code' => 'error', 'msg' => '平台不能为空']);
+        if (empty($platform_string)) return json_send(['code' => 'error', 'msg' => '平台不能为空']);
         $enable_full_quantity = request('enable_full_quantity', 0); //全量，0启用，1禁用
         $all_data['enable_full_quantity'] = $enable_full_quantity;
         if (trim($product_keyword) != '') {
@@ -374,7 +373,7 @@ class Product extends Controller
                 return json_send(['code' => 'error', 'msg' => '商品关键词不能超过5个']);
             }
         }
-        if($enable_full_quantity == 1 && $all_data['product_specs'] == ''){
+        if ($enable_full_quantity == 1 && $all_data['product_specs'] == '') {
             return json_send(['code' => 'error', 'msg' => '非全量采集，商品规格不能为空']);
         }
         //查询是否存在
@@ -498,19 +497,20 @@ class Product extends Controller
                     ->where(function ($query) use ($product_specs) {
                         // 平台条件（固定）
                         $query->where(function ($query_li) use ($product_specs) {
-
+                            if (!empty($product_specs)) {
                                 foreach ($product_specs as $product_spec) {
                                     if (empty($product_specs)) continue;
                                     $query_li->orWhereRaw("FIND_IN_SET(?, product_specs)", [$product_spec]);
                                 }
-                            });
-                        })->first();
-                    $platform_name = isset($platform_data[$platform]) ? $platform_data[$platform] : '';
-                    if (!empty($product_specs_log)) {
-                        return json_send(['code' => 'error', 'msg' => $platform_name . '存在重复的商品规格启用记录']);
-                    }
+                            }
+                        });
+                    })->first();
+                $platform_name = isset($platform_data[$platform]) ? $platform_data[$platform] : '';
+                if (!empty($product_specs_log)) {
+                    return json_send(['code' => 'error', 'msg' => $platform_name . '存在重复的商品规格启用记录']);
                 }
             }
+        }
         // 执行修改
         $result            =  $ProductModel->changeStatus($Product, $status);
         // 提示新增失败

app/Http/Controllers/Manager/Personnel/Employee.php

@@ -15,6 +15,7 @@ use App\Models\Manager\Personnel\EmployeePlatform as EmployeePlatformModel;
 use App\Models\Manager\Personnel\EmployeeOpenid as EmployeeOpenidModel;
 use App\Models\Manager\Personnel\EmployeeZoning as EmployeeZoningModel;
 use Illuminate\Support\Facades\DB;
+use App\Models\Manager\WashConfig\ViolationStore as ViolationStoreModel;
 
 /**
  * 人员信息管理-员工管理
@@ -520,7 +521,8 @@ class Employee extends Controller
         EmployeePlatformModel $EmployeePlatformModel,
         EmployeeOpenidModel $EmployeeOpenidModel,
         EmployeeProvinceModel $EmployeeProvinceModel,
-        EmployeeZoningModel $EmployeeZoningModel
+        EmployeeZoningModel $EmployeeZoningModel,
+        ViolationStoreModel $ViolationStoreModel,
     ) {
         // 验证参数
         $request->scene('delete')->validate();
@@ -581,6 +583,11 @@ class Employee extends Controller
             if ($user_zoning_totle > 0) {
                 $EmployeeZoningModel->where(['employee_id' => $id])->delete();
             }
+            //查询绑定的店铺配置信息
+            $user_store_config_totle = $ViolationStoreModel->orWhereRaw("FIND_IN_SET(?, employee_ids)", [$id])->count();
+            if ($user_store_config_totle > 0) {
+                 return json_send(['code' => 'error', 'msg' => '删除失败，该员工已绑定店铺配置信息，请先解除绑定后再删除', 'data' => '']);
+            }
             // 记录行为
             $table_name = $EmployeeModel->getTable();
             $notes_type = 3; //操作类型，1添加，2修改，3=删除

app/Http/Controllers/Manager/Process/LowPriceGoods.php

@@ -141,7 +141,7 @@ class LowPriceGoods extends Controller
         //多选第一责任人
         if ($first_responsible_person && is_string($first_responsible_person)) {
             $first_responsible_person = explode(',', $first_responsible_person);
-            $subQuery = $LowPriceGoodsMemberModel->whereIn('employee_id', $first_responsible_person)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $subQuery = $LowPriceGoodsMemberModel->whereIn('employee_id', $first_responsible_person)->where('duty_type',1)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
             $LowPriceGoodsModel = $LowPriceGoodsModel->whereIn('id', function ($query1) use ($subQuery) {
                 $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
             });
@@ -149,7 +149,7 @@ class LowPriceGoods extends Controller
         //多选责任人
         if ($responsible_person && is_string($responsible_person)) {
             $responsible_person = explode(',', $responsible_person);
-            $subQuery = $LowPriceGoodsMemberModel->whereIn('employee_id', $responsible_person)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $subQuery = $LowPriceGoodsMemberModel->whereIn('employee_id', $responsible_person)->where('duty_type',2)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
             $LowPriceGoodsModel = $LowPriceGoodsModel->whereIn('id', function ($query1) use ($subQuery) {
                 $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
             });
@@ -157,7 +157,7 @@ class LowPriceGoods extends Controller
         //多选溯源责任人
         if ($source_responsible_person && is_string($source_responsible_person)) {
             $source_responsible_person = explode(',', $source_responsible_person);
-            $subQuery = $LowPriceGoodsMemberModel->whereIn('employee_id', $source_responsible_person)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $subQuery = $LowPriceGoodsMemberModel->whereIn('employee_id', $source_responsible_person)->where('duty_type',3)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
             $LowPriceGoodsModel = $LowPriceGoodsModel->whereIn('id', function ($query1) use ($subQuery) {
                 $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
             });
@@ -172,12 +172,12 @@ class LowPriceGoods extends Controller
             $city_ids = explode(',', $city_ids);
             $LowPriceGoodsModel = $LowPriceGoodsModel->whereIn('city_id', $city_ids);
         }
-        //多选发货省份
+        //多选店铺省
         if ($shipment_province_ids && is_string($shipment_province_ids)) {
             $shipment_province_ids = explode(',', $shipment_province_ids);
             $LowPriceGoodsModel = $LowPriceGoodsModel->whereIn('shipment_province_id', $shipment_province_ids);
         }
-        //多选发货城市
+        //多选店铺市
         if ($shipment_city_ids && is_string($shipment_city_ids)) {
             $shipment_city_ids = explode(',', $shipment_city_ids);
             $LowPriceGoodsModel = $LowPriceGoodsModel->whereIn('shipment_city_id', $shipment_city_ids);
@@ -197,10 +197,12 @@ class LowPriceGoods extends Controller
             })
                 ->where($map)
                 ->orderByDesc('insert_time')
+                ->orderByDesc('collection_time')
                 ->paginate($limit)->toarray();
         } else {
             $result = $LowPriceGoodsModel->where($map)
                 ->orderByDesc('insert_time')
+                ->orderByDesc('collection_time')
                 ->paginate($limit)->toarray();
         }
         // 分配数据
@@ -266,6 +268,8 @@ class LowPriceGoods extends Controller
         $message_data['shipment_province_ids'] = request('shipment_province_ids', '');
         $message_data['shipment_city_ids'] = request('shipment_city_ids', '');
         $message_data['product_brand'] = request('product_brand', '');
+        $message_data['collection_time_start_time'] = request('collection_time_start_time', '');
+        $message_data['collection_time_end_time'] = request('collection_time_end_time', '');
 
         $low_price_goods_where = [];
         // 权限判断
@@ -274,12 +278,6 @@ class LowPriceGoods extends Controller
         } else {
             $low_price_goods_where['company_id']  = $message_data['admin_company_id'];
         }
-
-        $key_name = 'ExportLowPriceGoodsJobs_' . $low_price_goods_where['company_id'];
-        $export_data_info = Cache::get($key_name);
-        if ($export_data_info) return json_send(['code' => 'fail', 'msg' => '导出任务正在执行中，请稍后再试', 'data' => '']);
-        //创建缓存
-        Cache::put($key_name,'1', 60 * 60 * 3);
         // 查询条件
         $map  = [];
         $job_page = isset($message_data['job_page']) ? $message_data['job_page'] : 1;
@@ -306,7 +304,12 @@ class LowPriceGoods extends Controller
         $shipment_province_ids = $message_data['shipment_province_ids'] ?? '';
         $shipment_city_ids = $message_data['shipment_city_ids'] ?? '';
         $product_brand = $message_data['product_brand'] ?? '';
+
+        $collection_time_start_time = $message_data['collection_time_start_time'] ?? '';
+        $collection_time_end_time = $message_data['collection_time_end_time'] ?? '';
         // 时间条件
+        if ($collection_time_start_time) $map[] = ['collection_time', '>=', strtotime($collection_time_start_time)];
+        if ($collection_time_end_time) $map[] = ['collection_time', '<=', strtotime($collection_time_end_time)];
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
         // 其他条件
@@ -373,7 +376,7 @@ class LowPriceGoods extends Controller
         //多选第一责任人
         if ($first_responsible_person && is_string($first_responsible_person)) {
             $first_responsible_person = explode(',', $first_responsible_person);
-            $subQuery = $LowPriceGoodsMemberModel->whereIn('employee_id', $first_responsible_person)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $subQuery = $LowPriceGoodsMemberModel->whereIn('employee_id', $first_responsible_person)->where('duty_type',1)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
             $LowPriceGoodsModel = $LowPriceGoodsModel->whereIn('id', function ($query1) use ($subQuery) {
                 $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
             });
@@ -381,7 +384,7 @@ class LowPriceGoods extends Controller
         //多选责任人
         if ($responsible_person && is_string($responsible_person)) {
             $responsible_person = explode(',', $responsible_person);
-            $subQuery = $LowPriceGoodsMemberModel->whereIn('employee_id', $responsible_person)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $subQuery = $LowPriceGoodsMemberModel->whereIn('employee_id', $responsible_person)->where('duty_type',2)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
             $LowPriceGoodsModel = $LowPriceGoodsModel->whereIn('id', function ($query1) use ($subQuery) {
                 $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
             });
@@ -389,7 +392,7 @@ class LowPriceGoods extends Controller
         //多选溯源责任人
         if ($source_responsible_person && is_string($source_responsible_person)) {
             $source_responsible_person = explode(',', $source_responsible_person);
-            $subQuery = $LowPriceGoodsMemberModel->whereIn('employee_id', $source_responsible_person)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $subQuery = $LowPriceGoodsMemberModel->whereIn('employee_id', $source_responsible_person)->where('duty_type',3)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
             $LowPriceGoodsModel = $LowPriceGoodsModel->whereIn('id', function ($query1) use ($subQuery) {
                 $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
             });
@@ -404,12 +407,12 @@ class LowPriceGoods extends Controller
             $city_ids = explode(',', $city_ids);
             $LowPriceGoodsModel = $LowPriceGoodsModel->whereIn('city_id', $city_ids);
         }
-        //多选发货省份
+        //多选店铺省
         if ($shipment_province_ids && is_string($shipment_province_ids)) {
             $shipment_province_ids = explode(',', $shipment_province_ids);
             $LowPriceGoodsModel = $LowPriceGoodsModel->whereIn('shipment_province_id', $shipment_province_ids);
         }
-        //多选发货城市
+        //多选店铺市
         if ($shipment_city_ids && is_string($shipment_city_ids)) {
             $shipment_city_ids = explode(',', $shipment_city_ids);
             $LowPriceGoodsModel = $LowPriceGoodsModel->whereIn('shipment_city_id', $shipment_city_ids);
@@ -438,14 +441,20 @@ class LowPriceGoods extends Controller
         if ($result_count == 0) return json_send(['code' => 'fail', 'msg' => '没有查询到数据', 'data' => '']);
         if ($result_count > 150000) return json_send(['code' => 'fail', 'msg' => '导出数据超过15万条，请缩小导出范围后再试', 'data' => '']);
 
+        $key_name = 'ExportLowPriceGoodsJobs_' . $low_price_goods_where['company_id'];
+        $export_data_info = Cache::get($key_name);
+        if ($export_data_info) return json_send(['code' => 'fail', 'msg' => '导出任务正在执行中，请稍后再试', 'data' => '']);
+        //创建缓存
+        Cache::put($key_name,'1', 60 * 60 * 3);
+
         // 生成唯一文件ID
         $fileId                     = make_snow_flake();
         $message_data['file_id']    = $fileId;
         $fileName = '低价挂网商品数据' . $fileId . '.xlsx';
         $message_data['company_id']    = $low_price_goods_where['company_id'];
         $message_data['user_id']    = $message_data['user_id'];
-        ExportLowPriceGoodsJobs::dispatch($message_data);
-        // ExportLowPriceGoodsJobs::dispatchSync($message_data);
+        // ExportLowPriceGoodsJobs::dispatch($message_data);
+        ExportLowPriceGoodsJobs::dispatchSync($message_data);
         return json_send(['code' => 'success', 'msg' => '导出任务添加成功', 'data' => ['file_id' => $fileId, 'file_name' => $fileName]]);
     }
 
@@ -908,7 +917,7 @@ class LowPriceGoods extends Controller
         $sheet = $spreadsheet->getActiveSheet();
 
         //合并单元格
-        $sheet->mergeCells('A1:R1');
+        $sheet->mergeCells('A1:Y1');
         $sheet->setCellValue('A1', '低价挂网商品导入模板'); // 设置合并后的单元格内容
         // 获取合并后的单元格样式对象
         $style = $sheet->getStyle('A1');
@@ -920,7 +929,7 @@ class LowPriceGoods extends Controller
         $sheet->setCellValue('A2', '第一责任人姓名');
         $sheet->setCellValue('B2', '责任人姓名');
         $sheet->setCellValue('C2', '平台名称*');
-        $sheet->setCellValue('D2', '商品分类名称');
+        $sheet->setCellValue('D2', '商品类型');
         $sheet->setCellValue('E2', '品牌名称');
         $sheet->setCellValue('F2', '商品名称*');
         $sheet->setCellValue('G2', '商品规格*');
@@ -935,14 +944,13 @@ class LowPriceGoods extends Controller
         $sheet->setCellValue('P2', '店铺名称*');
         $sheet->setCellValue('Q2', '匿名店铺');
         $sheet->setCellValue('R2', '公司名称*');
-        $sheet->setCellValue('S2', '公司分类名称');
+        $sheet->setCellValue('S2', '商业类型');
         $sheet->setCellValue('T2', '信用代码');
-        $sheet->setCellValue('U2', '省份');
-        $sheet->setCellValue('V2', '城市');
-        $sheet->setCellValue('W2', '溯源责任人');
-        $sheet->setCellValue('X2', '检索采集日期(Y-m-d)*');
-        $sheet->setCellValue('Y2', '发货省份');
-        $sheet->setCellValue('Z2', '发货城市');
+        $sheet->setCellValue('U2', '公司省');
+        $sheet->setCellValue('V2', '公司市');
+        $sheet->setCellValue('W2', '店铺省');
+        $sheet->setCellValue('X2', '店铺市');
+        $sheet->setCellValue('Y2', '采集时间(Y-m-d H:i:s)*');
         // 生成 Excel 文件
         $writer = new Xlsx($spreadsheet);
 
@@ -1021,15 +1029,15 @@ class LowPriceGoods extends Controller
                 }
                 $source_responsible_person_id = [];
                 $source_responsible_person_name = $item[22];
-                if ($source_responsible_person_name) {
-                    $source_responsible_person_name = explode(',', $source_responsible_person_name);
-                    foreach ($source_responsible_person_name as $k => $v) {
-                        $v = trim($v);
-                        if (isset($result[$v])) {
-                            $source_responsible_person_id[] = $result[$v]['id'];
-                        }
-                    }
-                }
+                // if ($source_responsible_person_name) {
+                //     $source_responsible_person_name = explode(',', $source_responsible_person_name);
+                //     foreach ($source_responsible_person_name as $k => $v) {
+                //         $v = trim($v);
+                //         if (isset($result[$v])) {
+                //             $source_responsible_person_id[] = $result[$v]['id'];
+                //         }
+                //     }
+                // }
                 $province_name = $item[20];
                 //特殊地区1级移除市
                 if ($province_name && in_array($province_name, ['北京市', '天津市', '上海市', '重庆市'])) {
@@ -1067,7 +1075,7 @@ class LowPriceGoods extends Controller
                 if (!empty($city_name)  && !isset($city_id_data[$city_name])) return json_send(['code' => 'error', 'msg' => "第{$key_num}行城市信息不完整", 'data' => $item]);
 
 
-                $shipment_province_name = isset($item[24]) ? $item[24] : '';
+                $shipment_province_name = isset($item[22]) ? $item[22] : '';
                 //特殊地区1级移除市
                 if ($shipment_province_name && in_array($province_name, ['北京市', '天津市', '上海市', '重庆市'])) {
                     //移除市这个字符
@@ -1105,7 +1113,7 @@ class LowPriceGoods extends Controller
                     $shipment_province_id = $province_id_data[$shipment_province_name]['id'];
                 }
                 $shipment_city_id = '0';
-                $shipment_city_name = isset($item[25]) ? $item[25] : '';
+                $shipment_city_name = isset($item[23]) ? $item[23] : '';
                 if (!isset($city_id_data[$shipment_city_name])) {
                     $shipment_city_name = '';
                 } else {
@@ -1151,11 +1159,12 @@ class LowPriceGoods extends Controller
                 $insert_product_data['status'] = 0; //状态0=有效=无效
                 $insert_product_data['insert_time'] = time();
                 $insert_product_data['source_id'] = 0; // 原始数据ID
-                $insert_product_data['scrape_date'] = $item[23]; // 原始数据类型
-                $insert_product_data['shipment_province_id'] = $shipment_province_id; // 发货省份id
-                $insert_product_data['shipment_province_name'] = $shipment_province_name; // 发货省份
-                $insert_product_data['shipment_city_id'] = $shipment_city_id; // 发货城市id
-                $insert_product_data['shipment_city_name'] = $shipment_city_name; // 发货城市
+                $insert_product_data['shipment_province_id'] = $shipment_province_id; // 店铺省id
+                $insert_product_data['shipment_province_name'] = $shipment_province_name; // 店铺省
+                $insert_product_data['shipment_city_id'] = $shipment_city_id; // 店铺市id
+                $insert_product_data['shipment_city_name'] = $shipment_city_name; // 店铺市
+                $insert_product_data['collection_time'] = strtotime($item[24]); // 采集时间
+                $insert_product_data['scrape_date'] = date('Y-m-d',strtotime($item[24])); // 检索采集日期
                 //插入数据
                 $LowPriceGoodsModel->addLowPriceGoods($insert_product_data, true);
             }
@@ -1212,15 +1221,15 @@ class LowPriceGoods extends Controller
         // if (!$item[21]) {
         //     return ['code' => 'error', 'msg' => "第{$key}行城市不能为空", 'data' => $item];
         // }
-        if (!$item[23]) {
-            return ['code' => 'error', 'msg' => "第{$key}行检索采集日期不能为空", 'data' => $item];
+        if (!$item[24]) {
+            return ['code' => 'error', 'msg' => "第{$key}行采集时间不能为空", 'data' => $item];
         } else {
-            //校验格式是否为Y-m-d
-            if (!preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/', $item[23])) {
-                return ['code' => 'error', 'msg' => "第{$key}行检索采集日期格式不正确", 'data' => $item];
+            //校验格式是否为Y-m-d H:i:s
+            if (!preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}$/', $item[24])) {
+                return ['code' => 'error', 'msg' => "第{$key}行采集时间格式不正确", 'data' => $item];
             }
-            if (strtotime($item[23] . ' 00:00:00') > time()) {
-                return ['code' => 'error', 'msg' => "第{$key}行检索采集日期不能大于当前日期", 'data' => $item];
+            if (strtotime($item[24]) > time()) {
+                return ['code' => 'error', 'msg' => "第{$key}行采集时间不能大于当前日期", 'data' => $item];
             }
         }
     }

app/Http/Controllers/Manager/Process/SubNotice.php

@@ -5,12 +5,11 @@ namespace App\Http\Controllers\Manager\Process;
 use App\Http\Controllers\Controller;
 use App\Models\Manager\External\Company as CompanyModel;
 use App\Jobs\Manager\Process\SubNoticeJobs;
-use App\Models\Manager\Process\ExecuteLog as ExecuteLogModel;
 use App\Models\Manager\Process\SubNoticeLog as SubNoticeLogModel;
 use Illuminate\Support\Carbon;
-use Illuminate\Support\Facades\DB;
 use App\Jobs\Manager\Process\SendNoticeJobs;
 use Illuminate\Support\Facades\Cache;
+use App\Models\Manager\Personnel\NoticeConfig as NoticeConfigModel;
 
 /**
  * 违规处理订阅推送
@@ -27,26 +26,25 @@ class SubNotice extends Controller
      * @date      2025-12-11
      * 
      */
-    public function push_notice(CompanyModel $CompanyModel, ExecuteLogModel $ExecuteLogModel, SubNoticeLogModel $SubNoticeLogModel)
+    public function push_notice(CompanyModel $CompanyModel, SubNoticeLogModel $SubNoticeLogModel, NoticeConfigModel $NoticeConfigModel)
     {
         $todayStart = Carbon::today()->startOfDay()->getTimestamp(); // 今天开始时间 00:00:00
         $todayEnd = Carbon::today()->endOfDay()->getTimestamp(); // 今天结束时间 23:59:59
         // 查询数据
         $result = $CompanyModel->query()->get()->toArray();
         // 分配数据
-        if (!$result)  return 5;
+        if (!$result)  return 1;
         $key_index = 0;
         foreach ($result as $key => $item) {
+            //获取公司配置
+            $company_push_time = $NoticeConfigModel->query()->where('company_id', $item['id'])->value('push_time');
+            if (empty($company_push_time)) continue;
+            $company_push_time_string = date('Y-m-d', time()) . ' ' . $company_push_time . ':00';
+            //如果当前时间在公司配置时间前5个小时，则开始继续执行
+            $company_push_time_timestamp = strtotime($company_push_time_string);
+            if (time() < $company_push_time_timestamp - 3600*5) continue;
+
             $second = 60 * $key_index; // 每个商户延迟 60 秒
-            //查询低价商品清洗清洗情况
-            $action1 = $ExecuteLogModel->query()->where([['code', '=', 'LowPriceGoodsJobs'], ['company_id', '=', $item['id']], ['status', '=', '0'], ['insert_time', '>=', $todayStart], ['insert_time', '<=', $todayEnd]])->count();
-            if ($action1 < 1) continue;
-            //查询违规产品清洗清洗情况
-            $action2 = $ExecuteLogModel->query()->where([['code', '=', 'ViolationProductJobs'], ['company_id', '=', $item['id']], ['status', '=', '0'], ['insert_time', '>=', $todayStart], ['insert_time', '<=', $todayEnd]])->count();
-            if ($action2 < 1) continue;
-            //查询违规门店清洗清洗情况
-            $action3 = $ExecuteLogModel->query()->where([['code', '=', 'ViolationStoreJobs'], ['company_id', '=',  $item['id']], ['status', '=', '0'], ['insert_time', '>=', $todayStart], ['insert_time', '<=', $todayEnd]])->count();
-            if ($action3 < 1) continue;
             // 准备数据
             $message_data = ['company_id' => $item['id']];
 
@@ -61,7 +59,7 @@ class SubNotice extends Controller
                 $sub_noticeJobs_data_info = Cache::get($key_name);
                 if ($sub_noticeJobs_data_info) continue;
                 //创建缓存
-                Cache::put($key_name,'1', 86400); // 每个商户每天只统计执行一次
+                Cache::put($key_name, '1', 86400); // 每个商户每天只统计执行一次
                 //执行统计任务
                 SubNoticeJobs::dispatch($message_data)->delay($second);
                 // SubNoticeJobs::dispatchSync($message_data)->delay($second);;
@@ -69,6 +67,6 @@ class SubNotice extends Controller
             $key_index++;
         }
         // 告知结果
-        return 6;
+        return 2;
     }
 }

app/Http/Controllers/Manager/Process/ViolationProduct.php

@@ -141,7 +141,7 @@ class ViolationProduct extends Controller
         //多选第一责任人
         if ($first_responsible_person && is_string($first_responsible_person)) {
             $first_responsible_person = explode(',', $first_responsible_person);
-            $subQuery = $ViolationProductMemberModel->whereIn('employee_id', $first_responsible_person)->distinct('violation_product_logid')->select('violation_product_logid');
+            $subQuery = $ViolationProductMemberModel->whereIn('employee_id', $first_responsible_person)->where('duty_type',1)->distinct('violation_product_logid')->select('violation_product_logid');
             $ViolationProductModel = $ViolationProductModel->whereIn('id', function ($query1) use ($subQuery) {
                 $query1->select('violation_product_logid')->fromSub($subQuery, 'sub1');
             });
@@ -149,7 +149,7 @@ class ViolationProduct extends Controller
         //多选责任人
         if ($responsible_person && is_string($responsible_person)) {
             $responsible_person = explode(',', $responsible_person);
-            $subQuery = $ViolationProductMemberModel->whereIn('employee_id', $responsible_person)->distinct('violation_product_logid')->select('violation_product_logid');
+            $subQuery = $ViolationProductMemberModel->whereIn('employee_id', $responsible_person)->where('duty_type',2)->distinct('violation_product_logid')->select('violation_product_logid');
             $ViolationProductModel = $ViolationProductModel->whereIn('id', function ($query1) use ($subQuery) {
                 $query1->select('violation_product_logid')->fromSub($subQuery, 'sub1');
             });
@@ -157,7 +157,7 @@ class ViolationProduct extends Controller
         //多选溯源责任人
         if ($source_responsible_person && is_string($source_responsible_person)) {
             $source_responsible_person = explode(',', $source_responsible_person);
-            $subQuery = $ViolationProductMemberModel->whereIn('employee_id', $source_responsible_person)->distinct('violation_product_logid')->select('violation_product_logid');
+            $subQuery = $ViolationProductMemberModel->whereIn('employee_id', $source_responsible_person)->where('duty_type',3)->distinct('violation_product_logid')->select('violation_product_logid');
             $ViolationProductModel = $ViolationProductModel->whereIn('id', function ($query1) use ($subQuery) {
                 $query1->select('violation_product_logid')->fromSub($subQuery, 'sub1');
             });
@@ -172,12 +172,12 @@ class ViolationProduct extends Controller
             $city_ids = explode(',', $city_ids);
             $ViolationProductModel = $ViolationProductModel->whereIn('city_id', $city_ids);
         }
-        //多选发货省份
+        //多选店铺省
         if ($shipment_province_ids && is_string($shipment_province_ids)) {
             $shipment_province_ids = explode(',', $shipment_province_ids);
             $ViolationProductModel = $ViolationProductModel->whereIn('shipment_province_id', $shipment_province_ids);
         }
-        //多选发货城市
+        //多选店铺市
         if ($shipment_city_ids && is_string($shipment_city_ids)) {
             $shipment_city_ids = explode(',', $shipment_city_ids);
             $ViolationProductModel = $ViolationProductModel->whereIn('shipment_city_id', $shipment_city_ids);
@@ -197,11 +197,13 @@ class ViolationProduct extends Controller
             })
                 ->where($map)
                 ->orderByDesc('insert_time')
+                ->orderByDesc('collection_time')
                 ->paginate($limit)->toarray();
         } else {
             $result = $ViolationProductModel
                 ->where($map)
                 ->orderByDesc('insert_time')
+                ->orderByDesc('collection_time')
                 ->paginate($limit)->toarray();
         }
         // 分配数据
@@ -266,6 +268,8 @@ class ViolationProduct extends Controller
         $message_data['shipment_province_ids'] = request('shipment_province_ids', '');
         $message_data['shipment_city_ids'] = request('shipment_city_ids', '');
         $message_data['product_brand'] = request('product_brand', '');
+        $message_data['collection_time_start_time'] = request('collection_time_start_time', '');
+        $message_data['collection_time_end_time'] = request('collection_time_end_time', '');
 
         $violation_product_where = [];
         // 权限判断
@@ -274,12 +278,6 @@ class ViolationProduct extends Controller
         } else {
             $violation_product_where['company_id']  = $message_data['admin_company_id'];
         }
-        $key_name = 'ExportViolationProductJobs_' . $violation_product_where['company_id'];
-        $export_data_info = Cache::get($key_name);
-        if ($export_data_info) return json_send(['code' => 'fail', 'msg' => '导出任务正在执行中，请稍后再试', 'data' => '']);
-        //创建缓存
-        Cache::put($key_name,'1', 60 * 60 * 3);
-
 
         $admin_company_id = $message_data['admin_company_id'];
         $company_id = $message_data['company_id'];
@@ -309,7 +307,11 @@ class ViolationProduct extends Controller
         $shipment_province_ids = $message_data['shipment_province_ids'] ?? '';
         $shipment_city_ids = $message_data['shipment_city_ids'] ?? '';
         $product_brand = $message_data['product_brand'];
+        $collection_time_start_time = $message_data['collection_time_start_time'];
+        $collection_time_end_time = $message_data['collection_time_end_time'];
         // 时间条件
+        if ($collection_time_start_time) $map[] = ['collection_time', '>=', strtotime($collection_time_start_time)];
+        if ($collection_time_end_time) $map[] = ['collection_time', '<=', strtotime($collection_time_end_time)];
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
         // 其他条件
@@ -370,7 +372,7 @@ class ViolationProduct extends Controller
         //多选第一责任人
         if ($first_responsible_person && is_string($first_responsible_person)) {
             $first_responsible_person = explode(',', $first_responsible_person);
-            $subQuery = $ViolationProductModel->whereIn('employee_id', $first_responsible_person)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $subQuery = $ViolationProductModel->whereIn('employee_id', $first_responsible_person)->where('duty_type',1)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
             $ViolationProductModel = $ViolationProductModel->whereIn('id', function ($query1) use ($subQuery) {
                 $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
             });
@@ -378,7 +380,7 @@ class ViolationProduct extends Controller
         //多选责任人
         if ($responsible_person && is_string($responsible_person)) {
             $responsible_person = explode(',', $responsible_person);
-            $subQuery = $ViolationProductModel->whereIn('employee_id', $responsible_person)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $subQuery = $ViolationProductModel->whereIn('employee_id', $responsible_person)->where('duty_type',2)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
             $ViolationProductModel = $ViolationProductModel->whereIn('id', function ($query1) use ($subQuery) {
                 $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
             });
@@ -386,7 +388,7 @@ class ViolationProduct extends Controller
         //多选溯源责任人
         if ($source_responsible_person && is_string($source_responsible_person)) {
             $source_responsible_person = explode(',', $source_responsible_person);
-            $subQuery = $ViolationProductModel->whereIn('employee_id', $source_responsible_person)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
+            $subQuery = $ViolationProductModel->whereIn('employee_id', $source_responsible_person)->where('duty_type',3)->distinct('lowprice_product_logid')->select('lowprice_product_logid');
             $ViolationProductModel = $ViolationProductModel->whereIn('id', function ($query1) use ($subQuery) {
                 $query1->select('lowprice_product_logid')->fromSub($subQuery, 'sub1');
             });
@@ -401,12 +403,12 @@ class ViolationProduct extends Controller
             $city_ids = explode(',', $city_ids);
             $ViolationProductModel = $ViolationProductModel->whereIn('city_id', $city_ids);
         }
-        //多选发货省份
+        //多选店铺省
         if ($shipment_province_ids && is_string($shipment_province_ids)) {
             $shipment_province_ids = explode(',', $shipment_province_ids);
             $ViolationProductModel = $ViolationProductModel->whereIn('shipment_province_id', $shipment_province_ids);
         }
-        //多选发货城市
+        //多选店铺市
         if ($shipment_city_ids && is_string($shipment_city_ids)) {
             $shipment_city_ids = explode(',', $shipment_city_ids);
             $ViolationProductModel = $ViolationProductModel->whereIn('shipment_city_id', $shipment_city_ids);
@@ -435,6 +437,12 @@ class ViolationProduct extends Controller
         if ($result_count == 0) return json_send(['code' => 'fail', 'msg' => '没有查询到数据', 'data' => '']);
         if ($result_count > 150000) return json_send(['code' => 'fail', 'msg' => '导出数据超过15万条，请缩小导出范围后再试', 'data' => '']);
 
+        $key_name = 'ExportViolationProductJobs_' . $violation_product_where['company_id'];
+        $export_data_info = Cache::get($key_name);
+        if ($export_data_info) return json_send(['code' => 'fail', 'msg' => '导出任务正在执行中，请稍后再试', 'data' => '']);
+        //创建缓存
+        Cache::put($key_name,'1', 60 * 60 * 3);
+
         // 生成唯一文件ID
         $fileId                     = make_snow_flake();
         $message_data['file_id']    = $fileId;
@@ -713,7 +721,7 @@ class ViolationProduct extends Controller
         $sheet = $spreadsheet->getActiveSheet();
 
         //合并单元格
-        $sheet->mergeCells('A1:P1');
+        $sheet->mergeCells('A1:W1');
         $sheet->setCellValue('A1', '禁止挂网商品导入模板'); // 设置合并后的单元格内容
         // 获取合并后的单元格样式对象
         $style = $sheet->getStyle('A1');
@@ -740,12 +748,11 @@ class ViolationProduct extends Controller
         $sheet->setCellValue('P2', '公司名称*');
         $sheet->setCellValue('Q2', '公司分类名称');
         $sheet->setCellValue('R2', '信用代码');
-        $sheet->setCellValue('S2', '省份');
-        $sheet->setCellValue('T2', '城市');
-        $sheet->setCellValue('U2', '溯源责任人');
-        $sheet->setCellValue('V2', '检索采集日期(Y-m-d)*');
-        $sheet->setCellValue('W2', '发货省份');
-        $sheet->setCellValue('X2', '发货城市');
+        $sheet->setCellValue('S2', '公司省');
+        $sheet->setCellValue('T2', '公司市');
+        $sheet->setCellValue('U2', '店铺省');
+        $sheet->setCellValue('V2', '店铺市');
+        $sheet->setCellValue('W2', '采集时间(Y-m-d H:i:s)*');
         // 生成 Excel 文件
         $writer = new Xlsx($spreadsheet);
 
@@ -824,15 +831,15 @@ class ViolationProduct extends Controller
                 }
                 $source_responsible_person_id = [];
                 $source_responsible_person_name = $item[20];
-                if ($source_responsible_person_name) {
-                    $source_responsible_person_name = explode(',', $source_responsible_person_name);
-                    foreach ($source_responsible_person_name as $k => $v) {
-                        $v = trim($v);
-                        if (isset($result[$v])) {
-                            $source_responsible_person_id[] = $result[$v]['id'];
-                        }
-                    }
-                }
+                // if ($source_responsible_person_name) {
+                //     $source_responsible_person_name = explode(',', $source_responsible_person_name);
+                //     foreach ($source_responsible_person_name as $k => $v) {
+                //         $v = trim($v);
+                //         if (isset($result[$v])) {
+                //             $source_responsible_person_id[] = $result[$v]['id'];
+                //         }
+                //     }
+                // }
                 $province_name = $item[18];
                 //特殊地区1级移除市
                 if ($province_name && in_array($province_name, ['北京市', '天津市', '上海市', '重庆市'])) {
@@ -869,7 +876,7 @@ class ViolationProduct extends Controller
                 $city_name = $item[19];
                 if (!empty($city_name)  && !isset($city_id_data[$city_name])) return json_send(['code' => 'error', 'msg' => "第{$key_num}行城市信息不完整", 'data' => $item]);
 
-                $shipment_province_name = isset($item[22]) ? $item[22] : '';
+                $shipment_province_name = isset($item[20]) ? $item[20] : '';
                 //特殊地区1级移除市
                 if ($shipment_province_name && in_array($province_name, ['北京市', '天津市', '上海市', '重庆市'])) {
                     //移除市这个字符
@@ -907,7 +914,7 @@ class ViolationProduct extends Controller
                     $shipment_province_id = $province_id_data[$shipment_province_name]['id'];
                 }
                 $shipment_city_id = '0';
-                $shipment_city_name = isset($item[23]) ? $item[23] : '';
+                $shipment_city_name = isset($item[21]) ? $item[21] : '';
                 if (!isset($city_id_data[$shipment_city_name])) {
                     $shipment_city_name = '';
                 } else {
@@ -951,11 +958,12 @@ class ViolationProduct extends Controller
                 $insert_product_data['status'] = 0; //状态0=有效=无效
                 $insert_product_data['insert_time'] = time();
                 $insert_product_data['source_id'] = 0; // 原始数据ID
-                $insert_product_data['scrape_date'] = $item[21]; // 检索采集日期
-                $insert_product_data['shipment_province_id'] = $shipment_province_id; // 发货省份id
-                $insert_product_data['shipment_province_name'] = $shipment_province_name; // 发货省份
-                $insert_product_data['shipment_city_id'] = $shipment_city_id; // 发货城市id
-                $insert_product_data['shipment_city_name'] = $shipment_city_name; // 发货城市
+                $insert_product_data['shipment_province_id'] = $shipment_province_id; // 店铺省id
+                $insert_product_data['shipment_province_name'] = $shipment_province_name; // 店铺省
+                $insert_product_data['shipment_city_id'] = $shipment_city_id; // 店铺市id
+                $insert_product_data['shipment_city_name'] = $shipment_city_name; // 店铺市
+                $insert_product_data['scrape_date'] = date('Y-m-d',strtotime($item[22])); // 检索采集日期
+                $insert_product_data['collection_time'] = strtotime($item[22]); // 采集时间
                 //插入数据
                 $ViolationProductModel->addViolationProduct($insert_product_data, true);
             }
@@ -1006,15 +1014,15 @@ class ViolationProduct extends Controller
         // if (!$item[19]) {
         //     return ['code' => 'error', 'msg' => "第{$key}行城市不能为空", 'data' => $item];
         // }
-        if (!$item[21]) {
-            return ['code' => 'error', 'msg' => "第{$key}行检索采集日期不能为空", 'data' => $item];
+        if (!$item[22]) {
+            return ['code' => 'error', 'msg' => "第{$key}行采集时间不能为空", 'data' => $item];
         } else {
-            //校验格式是否为Y-m-d
-            if (!preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/', $item[21])) {
-                return ['code' => 'error', 'msg' => "第{$key}行检索采集日期格式不正确", 'data' => $item];
+            //校验格式是否为Y-m-d H:i:s
+            if (!preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}$/', $item[22])) {
+                return ['code' => 'error', 'msg' => "第{$key}行采集时间格式不正确", 'data' => $item];
             }
-            if (strtotime($item[21] . ' 00:00:00') > time()) {
-                return ['code' => 'error', 'msg' => "第{$key}行检索采集日期不能大于当前日期", 'data' => $item];
+            if (strtotime($item[22]) > time()) {
+                return ['code' => 'error', 'msg' => "第{$key}行采集时间不能大于当前时间", 'data' => $item];
             }
         }
     }

app/Http/Controllers/Manager/Process/ViolationStore.php

@@ -11,6 +11,7 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 use PhpOffice\PhpSpreadsheet\Style\Alignment;
 use App\Models\Api\Process\ViolationStoreMember as ViolationStoreMemberModel;
+use App\Jobs\Manager\Process\ViolationCompanyJobs;
 
 /**
  * 违规处理-违规店铺
@@ -159,11 +160,13 @@ class ViolationStore extends Controller
             })
                 ->where($map)
                 ->orderByDesc('insert_time')
+                ->orderByDesc('collection_time')
                 ->paginate($limit)->toarray();
         } else {
             $result = $ViolationStoreModel
                 ->where($map)
                 ->orderByDesc('insert_time')
+                ->orderByDesc('collection_time')
                 ->paginate($limit)->toarray();
         }
         // 分配数据
@@ -218,7 +221,11 @@ class ViolationStore extends Controller
         $online_posting_count = request('online_posting_count', '');
         $province_ids = request('province_ids', '');
         $city_ids = request('city_ids', '');
+        $collection_time_start_time = request('collection_time_start_time', '');
+        $collection_time_end_time = request('collection_time_end_time', '');
         // 时间条件
+        if ($collection_time_start_time) $map[] = ['collection_time', '>=', strtotime($collection_time_start_time)];
+        if ($collection_time_end_time) $map[] = ['collection_time', '<=', strtotime($collection_time_end_time)];
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
         //其它条件
@@ -734,6 +741,9 @@ class ViolationStore extends Controller
         $message_data = ['page' => '1', 'limit' => 50, 'admin_id' => $admin_id, 'is_admin' => $is_admin, 'company_id' => $company_id];
         ViolationStoreJobs::dispatch($message_data);
         // ViolationStoreJobs::dispatchSync($message_data);
+        ViolationCompanyJobs::dispatch($message_data);
+        // ViolationCompanyJobs::dispatchSync($message_data);
+        
         // 告知结果
         return             json_send(['code' => 'success', 'msg' => '执行成功']);
     }

app/Http/Controllers/Manager/WashConfig/ViolationStore.php

@@ -6,8 +6,6 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\Manager\WashConfig\ViolationStore as Request;
 use App\Models\Manager\WashConfig\ViolationStore as ViolationStoreModel;
 use App\Models\Manager\Personnel\Employee as EmployeeModel;
-use App\Models\Manager\WashConfig\CompanyCategory as CompanyCategoryModel;
-use App\Models\Manager\Citys as CitysModel;
 
 /**
  * 数据清洗-违规店铺配置
@@ -38,6 +36,9 @@ class ViolationStore extends Controller
         $end_time = request('end_time', '');
         $store_name = request('store_name', '');
         $store_type = request('store_type', '');//店铺类型:1=黑名单2=白名单
+        $platforms = request('platforms', '');//平台
+        $employee_ids = request('employee_ids', '');//员工ID
+        $employee_name = request('employee_name', '');//员工姓名
         // 时间条件
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
@@ -51,10 +52,43 @@ class ViolationStore extends Controller
         }else{
             $map[] = ['company_id', '=', $admin_company_id];
         }
-        $result = $ViolationStoreModel->query()
+        if (!empty($employee_name)) {
+            $employee_name_ids = $EmployeeModel->where('name', 'like', "%$employee_name%")->pluck('id')->toArray();
+            if (!empty($employee_name_ids)) {
+                $ViolationStoreModel = $ViolationStoreModel->where(function($query) use ($employee_name_ids) {
+                    foreach ($employee_name_ids as $employee_name_id) {
+                        if (empty($employee_name_id) || $employee_name_id == '') continue;
+                        $query->orWhereRaw("FIND_IN_SET(?, employee_ids)", [$employee_name_id]);
+                    }
+                });
+            }
+        }
+
+        if (!empty($platforms) && $platforms != '') {
+            $platforms = explode(',', $platforms);
+            $ViolationStoreModel = $ViolationStoreModel->where(function($query) use ($platforms) {
+                foreach ($platforms as $platform) {
+                    if(empty($platform) || $platform == '') continue;
+                    $query->orWhereRaw("FIND_IN_SET(?, platform)", [$platform]);
+                }
+            });
+        }
+
+        if (!empty($employee_ids) && $employee_ids != '') {
+            $employee_ids = explode(',', $employee_ids);
+            $ViolationStoreModel = $ViolationStoreModel->where(function($query) use ($employee_ids) {
+                foreach ($employee_ids as $employee_id) {
+                    if(empty($employee_id) || $employee_id == '') continue;
+                    $query->orWhereRaw("FIND_IN_SET(?, employee_ids)", [$employee_id]);
+                }
+            });
+        }
+
+        $result = $ViolationStoreModel
             ->where($map)
             ->orderByDesc('id')
-            ->paginate($limit)->toarray();
+            ->paginate($limit)
+            ->toarray();
         // 分配数据
         if (!$result)  return json_send(['code' => 'success', 'msg' => '获取成功', 'data' => []]);
         if (isset($result['data']) && count($result['data']) > 0) {

app/Jobs/Manager/Other/ExportLowPriceGoodsJobs.php

@@ -115,8 +115,12 @@ class ExportLowPriceGoodsJobs implements ShouldQueue
         $shipment_province_ids = $message_data['shipment_province_ids'] ?? '';
         $shipment_city_ids = $message_data['shipment_city_ids'] ?? '';
         $product_brand = $message_data['product_brand'] ?? '';
+        $collection_time_start_time = $message_data['collection_time_start_time'] ?? '';
+        $collection_time_end_time = $message_data['collection_time_end_time'] ?? '';
 
         // 时间条件
+        if ($collection_time_start_time) $map[] = ['collection_time', '>=', strtotime($collection_time_start_time)];
+        if ($collection_time_end_time) $map[] = ['collection_time', '<=', strtotime($collection_time_end_time)];
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
         // 其他条件
@@ -237,7 +241,7 @@ class ExportLowPriceGoodsJobs implements ShouldQueue
             });
         }
 
-        $query->orderByDesc('id')
+        $query->orderByDesc('insert_time')->orderByDesc('collection_time')
             ->chunkById($limit, function ($rows) use ($key_name) {
                 $result_data = $rows->toArray();
                 if (empty($result_data)) {
@@ -362,9 +366,10 @@ class ExportLowPriceGoodsJobs implements ShouldQueue
         $sheet->setCellValue('U2', '公司省');
         $sheet->setCellValue('V2', '公司市');
         $sheet->setCellValue('W2', '处理状态');
-        $sheet->setCellValue('X2', '记录时间');
-        $sheet->setCellValue('Y2', '店铺省');
-        $sheet->setCellValue('Z2', '店铺市');
+        $sheet->setCellValue('X2', '店铺省');
+        $sheet->setCellValue('Y2', '店铺市');
+        $sheet->setCellValue('Z2', '采集时间');
+        $sheet->setCellValue('AA2', '清洗时间');
 
         //平台0=全部，1=淘宝，2=京东，3=拼多多，4=美团，5=药师帮，6=1药城，7=药九九,8=药易购，9=药帮忙，10=熊猫药药11=药房网
         $platform_data = [
@@ -417,12 +422,13 @@ class ExportLowPriceGoodsJobs implements ShouldQueue
             $sheet->setCellValue('U' . $row, $item['province_name']);
             $sheet->setCellValue('V' . $row, $item['city_name']);
             $sheet->setCellValue('W' . $row, isset($processing_status_text[$item['processing_status']]) ? $processing_status_text[$item['processing_status']] : '');
-            $sheet->setCellValue('X' . $row, date('Y-m-d H:i:s', $item['insert_time']));
-            $sheet->setCellValue('Y' . $row, $item['shipment_province_name']);
-            $sheet->setCellValue('Z' . $row, $item['shipment_city_name']);
+            $sheet->setCellValue('X' . $row, $item['shipment_province_name']);
+            $sheet->setCellValue('Y' . $row, $item['shipment_city_name']);
+            $sheet->setCellValue('Z' . $row, !empty($item['collection_time']) ? date('Y-m-d H:i:s', $item['collection_time']) : '');
+            $sheet->setCellValue('AA' . $row, date('Y-m-d H:i:s', $item['insert_time']));
             $row++;
         }
-        foreach (range('A', 'Z') as $column) {
+        foreach (range('A', 'AA') as $column) {
             $sheet->getColumnDimension($column)->setAutoSize(true);
         }
         // 创建Excel文件

app/Jobs/Manager/Other/ExportViolationProductJobs.php

@@ -112,7 +112,11 @@ class ExportViolationProductJobs implements ShouldQueue
         $shipment_province_ids = $message_data['shipment_province_ids'] ?? '';
         $shipment_city_ids = $message_data['shipment_city_ids'] ?? '';
         $product_brand = $message_data['product_brand'];
+        $collection_time_start_time = $message_data['collection_time_start_time'] ?? '';
+        $collection_time_end_time = $message_data['collection_time_end_time'] ?? '';
         // 时间条件
+        if ($collection_time_start_time) $map[] = ['collection_time', '>=', strtotime($collection_time_start_time)];
+        if ($collection_time_end_time) $map[] = ['collection_time', '<=', strtotime($collection_time_end_time)];
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
         // 其他条件
@@ -233,7 +237,7 @@ class ExportViolationProductJobs implements ShouldQueue
                     ->orWhere('source_responsible_person', 'like', "%,$user_id,%");
             });
         }
-        $query->orderByDesc('id')
+        $query->orderByDesc('insert_time')->orderByDesc('collection_time')
             ->chunkById($limit, function ($rows) use ($key_name) {
                 $result_data = $rows->toArray();
                 if (empty($result_data)) {
@@ -356,9 +360,10 @@ class ExportViolationProductJobs implements ShouldQueue
         $sheet->setCellValue('S2', '公司省');
         $sheet->setCellValue('T2', '公司市');
         $sheet->setCellValue('U2', '处理状态');
-        $sheet->setCellValue('V2', '记录时间');
-        $sheet->setCellValue('W2', '店铺省');
-        $sheet->setCellValue('X2', '店铺市');
+        $sheet->setCellValue('V2', '店铺省');
+        $sheet->setCellValue('W2', '店铺市');
+        $sheet->setCellValue('X2', '采集时间');
+        $sheet->setCellValue('Y2', '清洗时间');
 
         //平台0=全部，1=淘宝，2=京东，3=拼多多，4=美团，5=药师帮，6=1药城，7=药九九,8=药易购，9=药帮忙，10=熊猫药药11=药房网
         $platform_data = [
@@ -409,12 +414,13 @@ class ExportViolationProductJobs implements ShouldQueue
             $sheet->setCellValue('S' . $row, $item['province_name']);
             $sheet->setCellValue('T' . $row, $item['city_name']);
             $sheet->setCellValue('U' . $row, isset($processing_status_text[$item['processing_status']]) ? $processing_status_text[$item['processing_status']] : '');
-            $sheet->setCellValue('V' . $row, date('Y-m-d H:i:s', $item['insert_time']));
-            $sheet->setCellValue('W' . $row, $item['shipment_province_name']);
-            $sheet->setCellValue('X' . $row, $item['shipment_city_name']);
+            $sheet->setCellValue('V' . $row, $item['shipment_province_name']);
+            $sheet->setCellValue('W' . $row, $item['shipment_city_name']);
+            $sheet->setCellValue('X' . $row, !!empty($item['collection_time']) ? date('Y-m-d H:i:s', $item['collection_time']) : '');
+            $sheet->setCellValue('Y' . $row, date('Y-m-d H:i:s', $item['insert_time']));
             $row++;
         }
-        foreach (range('A', 'X') as $column) {
+        foreach (range('A', 'Y') as $column) {
             $sheet->getColumnDimension($column)->setAutoSize(true);
         }
         // 创建Excel文件

app/Jobs/Manager/Process/LowPriceGoodsDataJobs.php

@@ -97,14 +97,12 @@ class LowPriceGoodsDataJobs implements ShouldQueue
             $ScrapeDataModel = $ScrapeDataModel->whereIn('platform_id', $platform);
         }
         $ScrapeDataModel = $ScrapeDataModel->where([['min_price', '>=', '0.01'], ['number', '>=', '1']]);
-
-        // $yesterdayStart = Carbon::today()->subDays(6)->startOfDay()->getTimestamp(); // 最近7天开始时间 00:00:00
-        $yesterdayStart = Carbon::yesterday()->startOfDay()->getTimestamp(); // 昨天开始时间 00:00:00
-        $yesterdayEnd = Carbon::yesterday()->endOfDay()->getTimestamp(); // 昨天结束时间 23:59:59
-        $yesterdayStart = date('Y-m-d', $yesterdayStart);
-        $yesterdayEnd = date('Y-m-d', $yesterdayEnd);
-        $where[] = ['scrape_date', '>=', $yesterdayStart];
-        $where[] = ['scrape_date', '<=', $yesterdayEnd];
+        $start_time = time() - 60 * 5; // 开始时间 5分钟之前
+        $end_time = time();//结束时间
+        $start_time_string = date('Y-m-d H:i:s', $start_time);
+        $end_time_string = date('Y-m-d H:i:s', $end_time);
+        $where[] = ['insert_time', '>=', $start_time_string];
+        $where[] = ['insert_time', '<=', $end_time_string];
         $where[] = ['product_name', 'like', '%' . $product_name . '%'];
         if ($enable_full_quantity == 1) $where[] = ['product_specs', 'like', '%' . $product_specs . '%']; //如果不是全量清洗，则查询规格
         // $where[] = ['one_box_price', '<', $suggested_price];
@@ -136,6 +134,7 @@ class LowPriceGoodsDataJobs implements ShouldQueue
             return true;
         }
         foreach ($product_datas as $product_data) {
+            //-------------------------------------- 处理营业执照地区信息(开始) --------------------------------------
             $province_name = $product_data['province_name'];
             $city_name = $product_data['city_name'];
             //特殊地区1级移除市
@@ -162,16 +161,168 @@ class LowPriceGoodsDataJobs implements ShouldQueue
                         break;
                 }
             } else if ($province_name && in_array($province_name, ['内蒙古自治区', '广西壮族自治区', '西藏自治区', '新疆维吾尔自治区', '宁夏回族自治区'])) {
-            } else if (strpos($province_name, '省') === false) {
+                //完整匹配不做处理
+            } else if (trim($province_name) != '' && strpos($province_name, '省') === false) {
+                //是否存在市省，如果不存在则补全
+                $province_name = $province_name . '省';
+            }
+            if (trim($province_name) != '') {
+                //根据最新处理后的省份名称获取省份ID
+                $db_province_id = $CitysModel->where([['name', '=', $province_name], ['level', '=', '1']])->value('id');
+                if (!empty($db_province_id)) {
+                    $product_data['province_id'] = $db_province_id;
+                }else{
+                    //逆推省份ID失败，则修改为未知名称
+                    $province_name ='未知';
+                }
+            } else {
+                //尝试从地区详情里面匹配省份名称
+                $db_province_data_list = $CitysModel->where([['level', '=', '1']])->select(['id','name'])->get()->toarray();
+                foreach ($db_province_data_list as $db_province_data) {
+                    $db_province_name = $db_province_data['name'];
+                    if (strpos($product_data['area_info'], $db_province_name) !== false) {
+                        $province_name = $db_province_name;
+                        $product_data['province_id'] = $db_province_data['id'];
+                        break;
+                    }
+                }
+            }
+            if (trim($city_name) != '') {
+                //校验是否存在县这个字眼
+                if (strpos($city_name, '县') !== false) {
+                    $db_city_id = $CitysModel->where([['name', '=', $city_name], ['level', '=', '2']])->value('id');
+                    if (!empty($db_city_id)) {
+                        $product_data['city_id'] = $db_city_id;
+                    }
+                } elseif (trim($city_name) != '' && strpos($city_name, '市') === false) {
+                    //是否存在市
+                    $city_name = $city_name . '市';
+                    //根据最新处理后的市名称获取市ID
+                    $db_city_id = $CitysModel->where([['name', '=', $city_name], ['level', '=', '2']])->value('id');
+                    if (!empty($db_city_id)) {
+                        $product_data['city_id'] = $db_city_id;
+                    }else{
+                        $city_name ='未知';
+                    }
+                } else {
+                    $db_city_id = $CitysModel->where([['name', '=', $city_name], ['level', '=', '2']])->value('id');
+                    if (!empty($db_city_id)) {
+                        $product_data['city_id'] = $db_city_id;
+                    }else{
+                        $city_name ='未知';
+                    }
+                }
+            } else {
+                if (trim($product_data['area_info']) != '') {
+                    //尝试从地区详情里面匹配市名称
+                    $db_city_name_list = $CitysModel->where([['level', '=', '2']])->pluck('name')->toarray();
+                    foreach ($db_city_name_list as $db_city_name) {
+                        if (strpos($product_data['area_info'], $db_city_name) !== false) {
+                            $db_city_id = $CitysModel->where([['name', '=', $db_city_name], ['level', '=', '2']])->value('id');
+                            $product_data['city_id'] = $db_city_id;
+                            $product_data['city_name'] = $db_city_name;
+                            $city_name = $db_city_name;
+                            break;
+                        }
+                    }
+                }
+            }
+            //如果存在市区city_id 则逆推省份ID以及名称
+            if (!empty($product_data['city_id']) && empty($product_data['province_id'])) {
+                $db_province_id = $CitysModel->where([['id', '=', $product_data['city_id']], ['level', '=', '2']])->value('pid');
+                $db_province_name = $CitysModel->where([['id', '=', $db_province_id], ['level', '=', '1']])->value('name');
+                $product_data['province_id'] = $db_province_id;
+                $product_data['province_name'] = $db_province_name;
+                $province_name = $db_province_name;
+            }
+            if (trim($product_data['area_info']) == '' && trim($city_name) != '' && trim($province_name) != '') {
+                $product_data['area_info'] = $province_name . $city_name;
+            }
+            //-------------------------------------- 处理营业执照地区信息(结束) --------------------------------------
+
+            //-------------------------------------- 处理发货省份地区信息(开始) --------------------------------------
+            $shipment_province_name = $product_data['shipment_province_name'];
+            $shipment_city_name = $product_data['shipment_city_name'];
+            //特殊地区1级移除市
+            if ($shipment_province_name && in_array($shipment_province_name, ['北京市', '天津市', '上海市', '重庆市'])) {
+                //移除市这个字符
+                $shipment_province_name = trim(str_replace('市', '', $shipment_province_name));
+            } else if ($shipment_province_name && in_array($shipment_province_name, ['北京', '天津', '上海', '重庆'])) {
+            } else if ($shipment_province_name && in_array($shipment_province_name, ['内蒙古', '广西', '西藏', '新疆', '宁夏'])) {
+                switch ($shipment_province_name) {
+                    case '内蒙古':
+                        $shipment_province_name = '内蒙古自治区';
+                        break;
+                    case '广西':
+                        $shipment_province_name = '广西壮族自治区';
+                        break;
+                    case '西藏':
+                        $shipment_province_name = '西藏自治区';
+                        break;
+                    case '新疆':
+                        $shipment_province_name = '新疆维吾尔自治区';
+                        break;
+                    case '宁夏':
+                        $shipment_province_name = '宁夏回族自治区';
+                        break;
+                }
+            } else if ($shipment_province_name && in_array($shipment_province_name, ['内蒙古自治区', '广西壮族自治区', '西藏自治区', '新疆维吾尔自治区', '宁夏回族自治区'])) {
+                //完整匹配不做处理
+            } else if (trim($shipment_province_name) != '' && strpos($shipment_province_name, '省') === false) {
                 //是否存在市省，如果不存在则补全
-                if (trim($province_name) != '' && strpos($province_name, '省') === false) {
-                    $province_name = $province_name . '省';
+                $shipment_province_name = $shipment_province_name . '省';
+            }
+            if (trim($shipment_province_name) != '') {
+                //根据最新处理后的省份名称获取省份ID
+                $db_shipment_province_id = $CitysModel->where([['name', '=', $shipment_province_name], ['level', '=', '1']])->value('id');
+                if (!empty($db_shipment_province_id)) {
+                    $product_data['shipment_province_id'] = $db_shipment_province_id;
+                }else{
+                    //逆推省份ID失败，则修改为未知名称
+                    $shipment_province_name = '未知';
+                }
+            }
+            if (trim($shipment_city_name) != '') {
+                //校验是否存在县这个字眼
+                if (strpos($shipment_city_name, '县') !== false) {
+                    $db_shipment_city_id = $CitysModel->where([['name', '=', $shipment_city_name], ['level', '=', '2']])->value('id');
+                    if (!empty($db_shipment_city_id)) {
+                        $product_data['shipment_city_id'] = $db_shipment_city_id;
+                    }
+                } elseif (trim($shipment_city_name) != '' && strpos($shipment_city_name, '市') === false) {
+                    //是否存在市
+                    $shipment_city_name = $shipment_city_name . '市';
+                    //根据最新处理后的市名称获取市ID
+                    $db_shipment_city_id = $CitysModel->where([['name', '=', $shipment_city_name], ['level', '=', '2']])->value('id');
+                    if (!empty($db_shipment_city_id)) {
+                        $product_data['shipment_city_id'] = $db_shipment_city_id;
+                    }else{
+                        //逆推市ID失败，则修改为未知名称
+                        $shipment_city_name = '未知';
+                    }
+                } else {
+                    $db_shipment_city_id = $CitysModel->where([['name', '=', $shipment_city_name], ['level', '=', '2']])->value('id');
+                    if (!empty($db_shipment_city_id)) {
+                        $product_data['shipment_city_id'] = $db_shipment_city_id;
+                    }else{
+                        //逆推市ID失败，则修改为未知名称
+                        $shipment_city_name = '未知';
+                    }
                 }
             }
-            // if ($city_name != '') {
-            //     $city_name_value = $CitysModel->where([['id', '=', $product_data['city_id']], ['level', '=', '2']])->value('name');
-            //     $city_name = !empty($city_name_value) ? $city_name_value : '';
-            // }
+            //如果存在市区shipment_city_id 则逆推省份ID以及名称
+            if (!empty($product_data['shipment_city_id']) && empty($product_data['shipment_province_id'])) {
+                $db_shipment_province_id = $CitysModel->where([['id', '=', $product_data['shipment_city_id']], ['level', '=', '2']])->value('pid');
+                $db_shipment_province_name = $CitysModel->where([['id', '=', $db_shipment_province_id], ['level', '=', '1']])->value('name');
+                $product_data['shipment_province_id'] = $db_shipment_province_id;
+                $product_data['shipment_province_name'] = $db_shipment_province_name;
+            }
+            //-------------------------------------- 处理发货省份地区信息(结束) --------------------------------------
+            //处理链接信息
+            preg_match('/https?:\/\/[^\s\'"<>]+/i', $product_data['link_url'], $matches);
+            if (!empty($matches)) {
+                $product_data['link_url'] = $matches[0];
+            }
             if (trim($product_data['link_url']) == '') continue;
             $insert_product_data = [
                 'company_id' => $company_id,

app/Jobs/Manager/Process/ViolationCompanyDataJobs.php

@@ -0,0 +1,401 @@
+<?php
+
+namespace App\Jobs\Manager\Process;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use App\Facades\Servers\Logs\Log;
+use App\Models\Manager\Process\ViolationStore as ViolationStoreModel;
+use App\Models\Manager\Personnel\Employee as EmployeeModel;
+use App\Models\Api\Process\ExecuteLog as ExecuteLogModel;
+use App\Models\Manager\Process\ScrapeData as ScrapeDataModel;
+use App\Models\Manager\WashConfig\ViolationCompanyMember as ViolationCompanyMemberModel;
+use App\Models\Manager\WashConfig\ViolationStore as WashConfigViolationStoreModel;
+use App\Models\Manager\Citys as CitysModel;
+use App\Models\Manager\Personnel\EmployeePlatform as EmployeePlatformModel;
+use App\Models\Manager\Personnel\EmployeeArea as EmployeeAreaModel;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Carbon;
+
+/**
+ * 数据清洗-违规公司店铺清洗数据队列
+ * @author  唐远望
+ * @version 1.0
+ * @date  2025-12-11
+ */
+class ViolationCompanyDataJobs implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    protected $message_data;
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct(array $message_data)
+    {
+        $this->message_data = $message_data;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        try {
+            $this->getViolationStoreData($this->message_data);
+        } catch (\Exception $e) {
+            Log::info('job_error', '数据清洗-违规公司店铺清洗数据队列失败', ['data' => $this->message_data, 'error' => $e->getMessage()]);
+        }
+    }
+
+
+    /**
+     * 采集商品数据清洗
+     * @author  唐远望
+     * @version 1.0
+     * @date  2025-12-11
+     */
+    public function getViolationStoreData($message_data)
+    {
+        $CitysModel = new CitysModel();
+        $EmployeeModel = new EmployeeModel();
+        $ViolationStoreModel = new ViolationStoreModel();
+        $ScrapeDataModel = new ScrapeDataModel();
+        $ViolationCompanyMemberModel = new ViolationCompanyMemberModel();
+        $EmployeePlatformModel = new EmployeePlatformModel();
+        $EmployeeAreaModel = new EmployeeAreaModel();
+        $WashConfigViolationStoreModel = new WashConfigViolationStoreModel();
+        $platform = $message_data['platform']; //多个平台配置
+        $company_name = $message_data['company_name']; //公司名称
+        $social_credit_code = $message_data['social_credit_code']; //社会信用代码
+        $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=关闭
+        $limit = isset($message_data['limit']) ? $message_data['limit'] : 50;
+        $page = isset($message_data['page']) ? $message_data['page'] : 1;
+        $company_id = isset($message_data['company_id']) ? $message_data['company_id'] : 0; //品牌方公司ID
+        $item_totle_page = $message_data['item_totle_page']; //清洗店铺总页数
+        $item_now_page = $message_data['item_now_page']; //清洗店铺当前页
+
+        $start_time = time() - 60 * 5; // 开始时间 5分钟之前
+        $end_time = time();//结束时间
+        $start_time_string = date('Y-m-d H:i:s', $start_time);
+        $end_time_string = date('Y-m-d H:i:s', $end_time);
+        $where_map[] = ['insert_time', '>=', $start_time_string];
+        $where_map[] = ['insert_time', '<=', $end_time_string];
+
+        if ($platform != '0' && !empty($platform)) {
+            $platform = explode(',', $platform);
+            $ScrapeDataModel = $ScrapeDataModel->where('qualification_number', $social_credit_code)->where($where_map)->whereIn('platform_id', $platform);
+        } else {
+            $ScrapeDataModel = $ScrapeDataModel->where('qualification_number', $social_credit_code)->where($where_map);
+        }
+        $product_data_info = $ScrapeDataModel->paginate($limit, ['*'], 'page', $page)->toarray();
+        $product_datas = $product_data_info['data'];
+        if (empty($product_datas)) {
+            if ($executeLog_id && $item_now_page >= $item_totle_page) {
+                (new ExecuteLogModel())->where('id', $executeLog_id)->update(['status' => 0, 'update_time' => time()]);
+            }
+            return true;
+        }
+        foreach ($product_datas as $product_data) {
+            $store_name = $product_data['store_name'];
+            $anonymous_store_name = $product_data['anonymous_store_name'];
+            if ($anonymous_store_name != '') {
+                $store_name = $anonymous_store_name;
+            }
+            //获取店铺是否有独立的人员责任人配置信息
+            $platform_id = $product_data['platform_id'];
+            $store_responsible_person_config = $WashConfigViolationStoreModel->where('store_name', $store_name)->where('company_id', $company_id)
+                ->whereRaw("FIND_IN_SET(?, platform)", [$platform_id])->where('status', 0)->first();
+            if (!empty($store_responsible_person_config)) {
+                continue; //如果店铺有独立的人员责任人配置信息，则跳过公司层级的责任人分配，直接走店铺层级的责任人分配
+            }
+            //-------------------------------------- 处理营业执照地区信息(开始) --------------------------------------
+            $province_name = $product_data['province_name'];
+            $city_name = $product_data['city_name'];
+            //特殊地区1级移除市
+            if ($province_name && in_array($province_name, ['北京市', '天津市', '上海市', '重庆市'])) {
+                //移除市这个字符
+                $province_name = trim(str_replace('市', '', $province_name));
+            } else if ($province_name && in_array($province_name, ['北京', '天津', '上海', '重庆'])) {
+            } else if ($province_name && in_array($province_name, ['内蒙古', '广西', '西藏', '新疆', '宁夏'])) {
+                switch ($province_name) {
+                    case '内蒙古':
+                        $province_name = '内蒙古自治区';
+                        break;
+                    case '广西':
+                        $province_name = '广西壮族自治区';
+                        break;
+                    case '西藏':
+                        $province_name = '西藏自治区';
+                        break;
+                    case '新疆':
+                        $province_name = '新疆维吾尔自治区';
+                        break;
+                    case '宁夏':
+                        $province_name = '宁夏回族自治区';
+                        break;
+                }
+            } else if ($province_name && in_array($province_name, ['内蒙古自治区', '广西壮族自治区', '西藏自治区', '新疆维吾尔自治区', '宁夏回族自治区'])) {
+                //完整匹配不做处理
+            } else if (trim($province_name) != '' && strpos($province_name, '省') === false) {
+                //是否存在市省，如果不存在则补全
+                $province_name = $province_name . '省';
+            }
+            if (trim($province_name) != '') {
+                //根据最新处理后的省份名称获取省份ID
+                $db_province_id = $CitysModel->where([['name', '=', $province_name], ['level', '=', '1']])->value('id');
+                if (!empty($db_province_id)) {
+                    $product_data['province_id'] = $db_province_id;
+                }else{
+                    //逆推省份ID失败，则修改为未知名称
+                    $province_name ='未知';
+                }
+            } else {
+                //尝试从地区详情里面匹配省份名称
+                $db_province_data_list = $CitysModel->where([['level', '=', '1']])->select(['id','name'])->get()->toarray();
+                foreach ($db_province_data_list as $db_province_data) {
+                    $db_province_name = $db_province_data['name'];
+                    if (strpos($product_data['area_info'], $db_province_name) !== false) {
+                        $province_name = $db_province_name;
+                        $product_data['province_id'] = $db_province_data['id'];
+                        break;
+                    }
+                }
+            }
+            if (trim($city_name) != '') {
+                //校验是否存在县这个字眼
+                if (strpos($city_name, '县') !== false) {
+                    $db_city_id = $CitysModel->where([['name', '=', $city_name], ['level', '=', '2']])->value('id');
+                    if (!empty($db_city_id)) {
+                        $product_data['city_id'] = $db_city_id;
+                    }
+                } elseif (trim($city_name) != '' && strpos($city_name, '市') === false) {
+                    //是否存在市
+                    $city_name = $city_name . '市';
+                    //根据最新处理后的市名称获取市ID
+                    $db_city_id = $CitysModel->where([['name', '=', $city_name], ['level', '=', '2']])->value('id');
+                    if (!empty($db_city_id)) {
+                        $product_data['city_id'] = $db_city_id;
+                    }else{
+                        $city_name ='未知';
+                    }
+                } else {
+                    $db_city_id = $CitysModel->where([['name', '=', $city_name], ['level', '=', '2']])->value('id');
+                    if (!empty($db_city_id)) {
+                        $product_data['city_id'] = $db_city_id;
+                    }else{
+                        $city_name ='未知';
+                    }
+                }
+            } else {
+                if (trim($product_data['area_info']) != '') {
+                    //尝试从地区详情里面匹配市名称
+                    $db_city_name_list = $CitysModel->where([['level', '=', '2']])->pluck('name')->toarray();
+                    foreach ($db_city_name_list as $db_city_name) {
+                        if (strpos($product_data['area_info'], $db_city_name) !== false) {
+                            $db_city_id = $CitysModel->where([['name', '=', $db_city_name], ['level', '=', '2']])->value('id');
+                            $product_data['city_id'] = $db_city_id;
+                            $product_data['city_name'] = $db_city_name;
+                            $city_name = $db_city_name;
+                            break;
+                        }
+                    }
+                }
+            }
+            //如果存在市区city_id 则逆推省份ID以及名称
+            if (!empty($product_data['city_id']) && empty($product_data['province_id'])) {
+                $db_province_id = $CitysModel->where([['id', '=', $product_data['city_id']], ['level', '=', '2']])->value('pid');
+                $db_province_name = $CitysModel->where([['id', '=', $db_province_id], ['level', '=', '1']])->value('name');
+                $product_data['province_id'] = $db_province_id;
+                $product_data['province_name'] = $db_province_name;
+                $province_name = $db_province_name;
+            }
+            if (trim($product_data['area_info']) == '' && trim($city_name) != '' && trim($province_name) != '') {
+                $product_data['area_info'] = $province_name . $city_name;
+            }
+            //-------------------------------------- 处理营业执照地区信息(结束) --------------------------------------
+
+            //处理链接信息
+            preg_match('/https?:\/\/[^\s\'"<>]+/i', $product_data['link_url'], $matches);
+            if (!empty($matches)) {
+                $product_data['link_url'] = $matches[0];
+            }
+            $insert_product_data = [
+                'company_id' => $company_id,
+                'source_id' => $product_data['id'],
+                'platform'    => $product_data['platform_id'],
+                'company_name'    => $product_data['company_name'],
+                'link_url'    => $product_data['link_url'],
+                'store_name'    => $store_name,
+                'social_credit_code' => $social_credit_code,
+                'province_id'    => $product_data['province_id'],
+                'province_name' => $province_name,
+                'city_id' => $product_data['city_id'],
+                'city_name' => $city_name,
+                'area_info' => $product_data['area_info'],
+                'company_category_name' => $company_category_name,
+                'first_responsible_person' => '',
+                'responsible_person' => '',
+                'source_responsible_person' => '',
+                'scrape_date' => $product_data['scrape_date'],
+                'collection_time' => strtotime($product_data['insert_time']),
+            ];
+            //获取公司绑定责任人信息
+            $company_data = $ViolationStoreModel->where('social_credit_code', $product_data['qualification_number'])
+                ->where('process_violation_store.company_id', $company_id)->first();
+            $employee_id_list = [];
+            if ($company_data) {
+                $employee_id_list = $ViolationCompanyMemberModel->where('company_logid', $company_data->id)->pluck('employee_id')->toarray();
+            }
+            //获取指定人员信息
+            if ($specify_responsible_person == 0) {
+                $where_query1 = [];
+                $where_query2 = [];
+                $where_query3 = [];
+                //查询指定公司第一责任人
+                if (!empty($employee_id_list)) {
+                    $where_query1[] = ['company_id', '=', $company_id];
+                    $where_query1[] = ['id', 'in', $employee_id_list];
+                    $where_query1[] = ['status', '=', 0];
+                    $where_query1[] = ['duty_type', '=', 1]; //责任类型1=第一责任人，2=责任人
+                }
+                //查询地区配置的第一责任人
+                $employee_id_area = $EmployeeAreaModel->where('city_id', $product_data['city_id'])->pluck('employee_id')->toarray();
+                if (!empty($employee_id_area)) {
+                    $where_query2[] = ['company_id', '=', $company_id];
+                    $where_query2[] = ['id', 'in', $employee_id_area];
+                    $where_query2[] = ['status', '=', 0];
+                    $where_query2[] = ['duty_type', '=', 1]; //责任类型1=第一责任人，2=责任人
+                }
+                //查询平台配置的第一责任人
+                $employee_id_platform = $EmployeePlatformModel->where('platform_id', $product_data['platform_id'])->pluck('employee_id')->toarray();
+                if (!empty($employee_id_platform)) {
+                    $where_query3[] = ['company_id', '=', $company_id];
+                    $where_query3[] = ['id', 'in', $employee_id_platform];
+                    $where_query3[] = ['status', '=', 0];
+                    $where_query3[] = ['duty_type', '=', 1]; //责任类型1=第一责任人，2=责任人
+                }
+                //并行查询第一责任人
+                $EmployeeModel = new EmployeeModel();
+                $EmployeeModel = $EmployeeModel
+                    ->orWhere(function ($q) use ($employee_id_list, $company_id) {
+                        if (!empty($employee_id_list)) {
+                            $q->where('company_id', $company_id)
+                                ->orWhereIn('id', $employee_id_list)
+                                ->where('status', 0)
+                                ->where('duty_type', 1);
+                        }
+                    })->orWhere(function ($q) use ($employee_id_area, $company_id) {
+                        if (!empty($employee_id_area)) {
+                            $q->where('company_id', $company_id)
+                                ->whereIn('id', $employee_id_area)
+                                ->where('status', 0)
+                                ->where('duty_type', 1);
+                        }
+                    })->orWhere(function ($q) use ($employee_id_platform, $company_id) {
+                        if (!empty($employee_id_platform)) {
+                            $q->where('company_id', $company_id)
+                                ->whereIn('id', $employee_id_platform)
+                                ->where('status', 0)
+                                ->where('duty_type', 1);
+                        }
+                    });
+                $first_responsible_person = $EmployeeModel->pluck('id')->implode(',');
+                //调试记录查询条件
+                $insert_product_data['first_responsible_person'] = $first_responsible_person;
+                //查询责任人
+                $where_query1 = [];
+                $where_query2 = [];
+                $where_query3 = [];
+                //查询指定公司责任人
+                if (!empty($employee_id_list)) {
+                    $where_query1[] = ['company_id', '=', $company_id];
+                    $where_query1[] = ['id', 'in', $employee_id_list];
+                    $where_query1[] = ['status', '=', 0];
+                    $where_query1[] = ['duty_type', '=', 2]; //责任类型1=第一责任人，2=责任人
+                }
+                //查询地区配置的员工
+                $employee_id_area = $EmployeeAreaModel->where('city_id', $product_data['city_id'])->pluck('employee_id')->toarray();
+                if (!empty($employee_id_area)) {
+                    $where_query2[] = ['company_id', '=', $company_id];
+                    $where_query2[] = ['id', 'in', $employee_id_area];
+                    $where_query2[] = ['status', '=', 0];
+                    $where_query2[] = ['duty_type', '=', 2]; //责任类型1=第一责任人，2=责任人
+                }
+                //查询平台配置的员工
+                $employee_id_platform = $EmployeePlatformModel->where('platform_id', $product_data['platform_id'])->pluck('employee_id')->toarray();
+                if (!empty($employee_id_platform)) {
+                    $where_query3[] = ['company_id', '=', $company_id];
+                    $where_query3[] = ['id', 'in', $employee_id_platform];
+                    $where_query3[] = ['status', '=', 0];
+                    $where_query3[] = ['duty_type', '=', 2]; //责任类型1=第一责任人，2=责任人
+                }
+                //并行查询责任人
+                $EmployeeModel = new EmployeeModel();
+                $EmployeeModel = $EmployeeModel
+                    ->orWhere(function ($q) use ($employee_id_list, $company_id) {
+                        if (!empty($employee_id_list)) {
+                            $q->where('company_id', $company_id)
+                                ->orWhereIn('id', $employee_id_list)
+                                ->where('status', 0)
+                                ->where('duty_type', 2); //责任类型1=第一责任人，2=责任人
+                        }
+                    })->orWhere(function ($q) use ($employee_id_area, $company_id) {
+                        if (!empty($employee_id_area)) {
+                            $q->where('company_id', $company_id)
+                                ->whereIn('id', $employee_id_area)
+                                ->where('status', 0)
+                                ->where('duty_type', 2); //责任类型1=第一责任人，2=责任人
+                        }
+                    })->orWhere(function ($q) use ($employee_id_platform, $company_id) {
+                        if (!empty($employee_id_platform)) {
+                            $q->where('company_id', $company_id)
+                                ->whereIn('id', $employee_id_platform)
+                                ->where('status', 0)
+                                ->where('duty_type', 2); //责任类型1=第一责任人，2=责任人
+                        }
+                    });
+                $responsible_person = $EmployeeModel->pluck('id')->implode(',');
+                $insert_product_data['responsible_person'] = $responsible_person;
+
+                //溯源责任人
+                $source_responsible_person = '';
+                if ($first_responsible_person && $responsible_person) {
+                    //转换成数组，合并后在去重
+                    $first_responsible_person = explode(',', $first_responsible_person);
+                    $responsible_person = explode(',', $responsible_person);
+                    $source_responsible_person = array_unique(array_merge($first_responsible_person, $responsible_person));
+                    $source_responsible_person = ',' . implode(',', $source_responsible_person) . ',';
+                } else if ($first_responsible_person) {
+                    $source_responsible_person = $first_responsible_person;
+                } else if ($responsible_person) {
+                    $source_responsible_person = $responsible_person;
+                }
+                $insert_product_data['source_responsible_person'] = $source_responsible_person;
+            }
+
+            //插入数据
+            $ViolationStoreModel->addViolationStore($insert_product_data);
+        }
+        //继续执行下一页
+        $message_data['page'] = $page + 1;
+        $message_data['limit'] = $limit;
+        ViolationCompanyDataJobs::dispatch($message_data);
+    }
+
+
+    public function failed(\Throwable $exception)
+    {
+        Log::info('job_error', '数据清洗-违规公司店铺清洗数据队列完全失败', ['data' => $this->message_data, 'error' => $exception]);
+    }
+}

app/Jobs/Manager/Process/ViolationCompanyJobs.php

@@ -0,0 +1,104 @@
+<?php
+
+namespace App\Jobs\Manager\Process;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use App\Facades\Servers\Logs\Log;
+use App\Models\Manager\WashConfig\ViolationCompany as ViolationCompanyModel;
+use App\Models\Manager\Process\ExecuteLog as ExecuteLogModel;
+use App\Jobs\Manager\Process\ViolationCompanyDataJobs;
+
+/**
+ * 数据清洗-违规挂网公司配置队列
+ * @author  唐远望
+ * @version 1.0
+ * @date  2025-12-11
+ */
+class ViolationCompanyJobs implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    protected $message_data;
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct(array $message_data)
+    {
+        $this->message_data = $message_data;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        try {
+            $ViolationCompanyModel = new ViolationCompanyModel();
+            $limit = isset($this->message_data['limit']) ? $this->message_data['limit'] : 50;
+            $page = isset($this->message_data['page']) ? $this->message_data['page'] : 1;
+            $executeLog_id = isset($this->message_data['executeLog_id']) ? $this->message_data['executeLog_id'] : 0;
+            $admin_id = isset($this->message_data['admin_id']) ? $this->message_data['admin_id'] : 0;
+            $is_admin = isset($this->message_data['is_admin']) ? $this->message_data['is_admin'] : 0;
+            $company_id = isset($this->message_data['company_id']) ? $this->message_data['company_id'] : 0;
+            if($page == 1){
+                $ExecuteLogModel = new ExecuteLogModel();
+                $insert_data =['company_id'=>$company_id,'name' =>'违规挂网公司店铺', 'code' => 'ViolationCompanyJobs', 'admin_id' => $admin_id,'is_admin' => $is_admin];
+                $executeLog_id=$ExecuteLogModel->addExecuteLog_content($insert_data);
+            }
+            $ViolationCompanyModel = $ViolationCompanyModel->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){
+                $ViolationCompanyModel = $ViolationCompanyModel->where('washconfig_violation_company.company_id', $company_id);
+            }
+            $totle_page = 0;
+            $list_config_data = $ViolationCompanyModel->paginate($limit, ['*'], 'page', $page)->toarray();
+            if (!$list_config_data || empty($list_config_data['data'])) {
+                if($page == 1 && $executeLog_id){
+                    $ExecuteLogModel->where('id', $executeLog_id)->update(['status' => 0,'update_time'=> time()]);
+                }
+                return true;
+            }
+            $totle_page = $list_config_data['last_page'];
+            $list_data = $list_config_data['data'];
+            foreach ($list_data as $key => $value) {
+                $message_data = [
+                    'company_id' => $value['company_id'],
+                    'id' => $value['id'],
+                    'platform' => $value['platform'],
+                    'company_type' => $value['company_type'],
+                    'company_name' => $value['company_name'],
+                    'social_credit_code' => $value['social_credit_code'],
+                    'executeLog_id' => $executeLog_id,
+                    'company_category_name' => $value['category_name'],
+                    'specify_responsible_person' => $value['specify_responsible_person'],
+                    'item_totle_page' => $totle_page,
+                    'item_now_page' => $page,
+                ];
+                ViolationCompanyDataJobs::dispatch($message_data);
+                // ViolationCompanyDataJobs::dispatchSync($message_data);
+            }
+            $now_message_data = [
+                'limit' => $limit,
+                'page' => $page + 1,
+                'executeLog_id' => $executeLog_id,
+            ];
+            ViolationCompanyJobs::dispatch($now_message_data);
+        } catch (\Exception $e) {
+            Log::info('job_error', '数据清洗-违规挂网公司队列失败', ['data' => $this->message_data, 'error' => $e->getMessage()]);
+        }
+    }
+
+
+    public function failed(\Throwable $exception)
+    {
+        Log::info('job_error', '数据清洗-违规挂网公司队列完全失败', ['data' => $this->message_data, 'error' => $exception]);
+    }
+}

app/Jobs/Manager/Process/ViolationProductDataJobs.php

@@ -95,13 +95,12 @@ class ViolationProductDataJobs implements ShouldQueue
             $platform = explode(',', $platform);
             $ScrapeDataModel = $ScrapeDataModel->whereIn('platform_id', $platform);
         }
-        // $yesterdayStart = Carbon::today()->subDays(6)->startOfDay()->getTimestamp(); // 最近7天开始时间 00:00:00
-        $yesterdayStart = Carbon::yesterday()->startOfDay()->getTimestamp(); // 昨天开始时间 00:00:00
-        $yesterdayEnd = Carbon::yesterday()->endOfDay()->getTimestamp(); // 昨天结束时间 23:59:59
-        $yesterdayStart = date('Y-m-d', $yesterdayStart);
-        $yesterdayEnd = date('Y-m-d', $yesterdayEnd);
-        $where[] = ['scrape_date', '>=', $yesterdayStart];
-        $where[] = ['scrape_date', '<=', $yesterdayEnd];
+        $start_time = time() - 60 * 5; // 开始时间 5分钟之前
+        $end_time = time();//结束时间
+        $start_time_string = date('Y-m-d H:i:s', $start_time);
+        $end_time_string = date('Y-m-d H:i:s', $end_time);
+        $where[] = ['insert_time', '>=', $start_time_string];
+        $where[] = ['insert_time', '<=', $end_time_string];
         $where[] = ['product_name', 'like', '%' . $product_name . '%'];
         if ($enable_full_quantity == 1) $where[] = ['product_specs', 'like', '%' . $product_specs . '%']; //如果不是全量清洗，则查询规格
 
@@ -130,6 +129,7 @@ class ViolationProductDataJobs implements ShouldQueue
             return true;
         }
         foreach ($product_datas as $product_data) {
+            //-------------------------------------- 处理营业执照地区信息(开始) --------------------------------------
             $province_name = $product_data['province_name'];
             $city_name = $product_data['city_name'];
             //特殊地区1级移除市
@@ -156,16 +156,168 @@ class ViolationProductDataJobs implements ShouldQueue
                         break;
                 }
             } else if ($province_name && in_array($province_name, ['内蒙古自治区', '广西壮族自治区', '西藏自治区', '新疆维吾尔自治区', '宁夏回族自治区'])) {
-            } else if (strpos($province_name, '省') === false) {
+                //完整匹配不做处理
+            } else if (trim($province_name) != '' && strpos($province_name, '省') === false) {
                 //是否存在市省，如果不存在则补全
-                if (trim($province_name) != '' &&  strpos($province_name, '省') === false) {
-                    $province_name = $province_name . '省';
+                $province_name = $province_name . '省';
+            }
+            if (trim($province_name) != '') {
+                //根据最新处理后的省份名称获取省份ID
+                $db_province_id = $CitysModel->where([['name', '=', $province_name], ['level', '=', '1']])->value('id');
+                if (!empty($db_province_id)) {
+                    $product_data['province_id'] = $db_province_id;
+                }else{
+                    //逆推省份ID失败，则修改为未知名称
+                    $province_name ='未知';
+                }
+            } else {
+                //尝试从地区详情里面匹配省份名称
+                $db_province_data_list = $CitysModel->where([['level', '=', '1']])->select(['id','name'])->get()->toarray();
+                foreach ($db_province_data_list as $db_province_data) {
+                    $db_province_name = $db_province_data['name'];
+                    if (strpos($product_data['area_info'], $db_province_name) !== false) {
+                        $province_name = $db_province_name;
+                        $product_data['province_id'] = $db_province_data['id'];
+                        break;
+                    }
+                }
+            }
+            if (trim($city_name) != '') {
+                //校验是否存在县这个字眼
+                if (strpos($city_name, '县') !== false) {
+                    $db_city_id = $CitysModel->where([['name', '=', $city_name], ['level', '=', '2']])->value('id');
+                    if (!empty($db_city_id)) {
+                        $product_data['city_id'] = $db_city_id;
+                    }
+                } elseif (trim($city_name) != '' && strpos($city_name, '市') === false) {
+                    //是否存在市
+                    $city_name = $city_name . '市';
+                    //根据最新处理后的市名称获取市ID
+                    $db_city_id = $CitysModel->where([['name', '=', $city_name], ['level', '=', '2']])->value('id');
+                    if (!empty($db_city_id)) {
+                        $product_data['city_id'] = $db_city_id;
+                    }else{
+                        $city_name ='未知';
+                    }
+                } else {
+                    $db_city_id = $CitysModel->where([['name', '=', $city_name], ['level', '=', '2']])->value('id');
+                    if (!empty($db_city_id)) {
+                        $product_data['city_id'] = $db_city_id;
+                    }else{
+                        $city_name ='未知';
+                    }
+                }
+            } else {
+                if (trim($product_data['area_info']) != '') {
+                    //尝试从地区详情里面匹配市名称
+                    $db_city_name_list = $CitysModel->where([['level', '=', '2']])->pluck('name')->toarray();
+                    foreach ($db_city_name_list as $db_city_name) {
+                        if (strpos($product_data['area_info'], $db_city_name) !== false) {
+                            $db_city_id = $CitysModel->where([['name', '=', $db_city_name], ['level', '=', '2']])->value('id');
+                            $product_data['city_id'] = $db_city_id;
+                            $product_data['city_name'] = $db_city_name;
+                            $city_name = $db_city_name;
+                            break;
+                        }
+                    }
                 }
             }
-            // if ($city_name != '') {
-            //     $city_name_value = $CitysModel->where([['id', '=', $product_data['city_id']], ['level', '=', '2']])->value('name');
-            //     $city_name = !empty($city_name_value) ? $city_name_value : '';
-            // }
+            //如果存在市区city_id 则逆推省份ID以及名称
+            if (!empty($product_data['city_id']) && empty($product_data['province_id'])) {
+                $db_province_id = $CitysModel->where([['id', '=', $product_data['city_id']], ['level', '=', '2']])->value('pid');
+                $db_province_name = $CitysModel->where([['id', '=', $db_province_id], ['level', '=', '1']])->value('name');
+                $product_data['province_id'] = $db_province_id;
+                $product_data['province_name'] = $db_province_name;
+                $province_name = $db_province_name;
+            }
+            if (trim($product_data['area_info']) == '' && trim($city_name) != '' && trim($province_name) != '') {
+                $product_data['area_info'] = $province_name . $city_name;
+            }
+            //-------------------------------------- 处理营业执照地区信息(结束) --------------------------------------
+
+            //-------------------------------------- 处理发货省份地区信息(开始) --------------------------------------
+            $shipment_province_name = $product_data['shipment_province_name'];
+            $shipment_city_name = $product_data['shipment_city_name'];
+            //特殊地区1级移除市
+            if ($shipment_province_name && in_array($shipment_province_name, ['北京市', '天津市', '上海市', '重庆市'])) {
+                //移除市这个字符
+                $shipment_province_name = trim(str_replace('市', '', $shipment_province_name));
+            } else if ($shipment_province_name && in_array($shipment_province_name, ['北京', '天津', '上海', '重庆'])) {
+            } else if ($shipment_province_name && in_array($shipment_province_name, ['内蒙古', '广西', '西藏', '新疆', '宁夏'])) {
+                switch ($shipment_province_name) {
+                    case '内蒙古':
+                        $shipment_province_name = '内蒙古自治区';
+                        break;
+                    case '广西':
+                        $shipment_province_name = '广西壮族自治区';
+                        break;
+                    case '西藏':
+                        $shipment_province_name = '西藏自治区';
+                        break;
+                    case '新疆':
+                        $shipment_province_name = '新疆维吾尔自治区';
+                        break;
+                    case '宁夏':
+                        $shipment_province_name = '宁夏回族自治区';
+                        break;
+                }
+            } else if ($shipment_province_name && in_array($shipment_province_name, ['内蒙古自治区', '广西壮族自治区', '西藏自治区', '新疆维吾尔自治区', '宁夏回族自治区'])) {
+                //完整匹配不做处理
+            } else if (trim($shipment_province_name) != '' && strpos($shipment_province_name, '省') === false) {
+                //是否存在市省，如果不存在则补全
+                $shipment_province_name = $shipment_province_name . '省';
+            }
+            if (trim($shipment_province_name) != '') {
+                //根据最新处理后的省份名称获取省份ID
+                $db_shipment_province_id = $CitysModel->where([['name', '=', $shipment_province_name], ['level', '=', '1']])->value('id');
+                if (!empty($db_shipment_province_id)) {
+                    $product_data['shipment_province_id'] = $db_shipment_province_id;
+                }else{
+                    //逆推省份ID失败，则修改为未知名称
+                    $shipment_province_name = '未知';
+                }
+            }
+            if (trim($shipment_city_name) != '') {
+                //校验是否存在县这个字眼
+                if (strpos($shipment_city_name, '县') !== false) {
+                    $db_shipment_city_id = $CitysModel->where([['name', '=', $shipment_city_name], ['level', '=', '2']])->value('id');
+                    if (!empty($db_shipment_city_id)) {
+                        $product_data['shipment_city_id'] = $db_shipment_city_id;
+                    }
+                } elseif (trim($shipment_city_name) != '' && strpos($shipment_city_name, '市') === false) {
+                    //是否存在市
+                    $shipment_city_name = $shipment_city_name . '市';
+                    //根据最新处理后的市名称获取市ID
+                    $db_shipment_city_id = $CitysModel->where([['name', '=', $shipment_city_name], ['level', '=', '2']])->value('id');
+                    if (!empty($db_shipment_city_id)) {
+                        $product_data['shipment_city_id'] = $db_shipment_city_id;
+                    }else{
+                        //逆推市ID失败，则修改为未知名称
+                        $shipment_city_name = '未知';
+                    }
+                } else {
+                    $db_shipment_city_id = $CitysModel->where([['name', '=', $shipment_city_name], ['level', '=', '2']])->value('id');
+                    if (!empty($db_shipment_city_id)) {
+                        $product_data['shipment_city_id'] = $db_shipment_city_id;
+                    }else{
+                        //逆推市ID失败，则修改为未知名称
+                        $shipment_city_name = '未知';
+                    }
+                }
+            }
+            //如果存在市区shipment_city_id 则逆推省份ID以及名称
+            if (!empty($product_data['shipment_city_id']) && empty($product_data['shipment_province_id'])) {
+                $db_shipment_province_id = $CitysModel->where([['id', '=', $product_data['shipment_city_id']], ['level', '=', '2']])->value('pid');
+                $db_shipment_province_name = $CitysModel->where([['id', '=', $db_shipment_province_id], ['level', '=', '1']])->value('name');
+                $product_data['shipment_province_id'] = $db_shipment_province_id;
+                $product_data['shipment_province_name'] = $db_shipment_province_name;
+            }
+            //-------------------------------------- 处理发货省份地区信息(结束) --------------------------------------
+            //处理链接信息
+            preg_match('/https?:\/\/[^\s\'"<>]+/i', $product_data['link_url'], $matches);
+            if (!empty($matches)) {
+                $product_data['link_url'] = $matches[0];
+            }
             if (trim($product_data['link_url']) == '') continue;
             $insert_product_data = [
                 'company_id' => $company_id,

app/Jobs/Manager/Process/ViolationStoreDataJobs.php

@@ -71,11 +71,8 @@ class ViolationStoreDataJobs implements ShouldQueue
         $EmployeePlatformModel = new EmployeePlatformModel();
         $EmployeeAreaModel = new EmployeeAreaModel();
         $platform = $message_data['platform']; //多个平台配置
-        $company_name = $message_data['company_name']; //公司名称
-        $social_credit_code = $message_data['social_credit_code']; //社会信用代码
-        $company_type = $message_data['company_type']; //公司类型:1=黑名单2=白名单
         $executeLog_id = $message_data['executeLog_id'];
-        $company_category_name = $message_data['company_category_name']; //公司类别名称
+        $store_name = $message_data['store_name']; //店铺名称
         $specify_responsible_person = $message_data['specify_responsible_person']; //指派责任人 0=开启 1=关闭
         $limit = isset($message_data['limit']) ? $message_data['limit'] : 50;
         $page = isset($message_data['page']) ? $message_data['page'] : 1;
@@ -83,19 +80,18 @@ class ViolationStoreDataJobs implements ShouldQueue
         $item_totle_page = $message_data['item_totle_page']; //清洗店铺总页数
         $item_now_page = $message_data['item_now_page']; //清洗店铺当前页
 
-        // $yesterdayStart = Carbon::today()->subDays(6)->startOfDay()->getTimestamp(); // 最近7天开始时间 00:00:00
-        $yesterdayStart = Carbon::yesterday()->startOfDay()->getTimestamp(); // 昨天开始时间 00:00:00
-        $yesterdayEnd = Carbon::yesterday()->endOfDay()->getTimestamp(); // 昨天结束时间 23:59:59
-        $yesterdayStart = date('Y-m-d', $yesterdayStart);
-        $yesterdayEnd = date('Y-m-d', $yesterdayEnd);
-        $where_map[] = ['scrape_date', '>=', $yesterdayStart];
-        $where_map[] = ['scrape_date', '<=', $yesterdayEnd];
+        $start_time = time() - 60 * 5; // 开始时间 5分钟之前
+        $end_time = time();//结束时间
+        $start_time_string = date('Y-m-d H:i:s', $start_time);
+        $end_time_string = date('Y-m-d H:i:s', $end_time);
+        $where_map[] = ['insert_time', '>=', $start_time_string];
+        $where_map[] = ['insert_time', '<=', $end_time_string];
 
         if ($platform != '0' && !empty($platform)) {
             $platform = explode(',', $platform);
-            $ScrapeDataModel = $ScrapeDataModel->where('qualification_number', $social_credit_code)->where($where_map)->whereIn('platform_id', $platform);
+            $ScrapeDataModel = $ScrapeDataModel->where('store_name', $store_name)->where($where_map)->whereIn('platform_id', $platform);
         } else {
-            $ScrapeDataModel = $ScrapeDataModel->where('qualification_number', $social_credit_code)->where($where_map);
+            $ScrapeDataModel = $ScrapeDataModel->where('store_name', $store_name)->where($where_map);
         }
         $product_data_info = $ScrapeDataModel->paginate($limit, ['*'], 'page', $page)->toarray();
         $product_datas = $product_data_info['data'];
@@ -106,6 +102,7 @@ class ViolationStoreDataJobs implements ShouldQueue
             return true;
         }
         foreach ($product_datas as $product_data) {
+            //-------------------------------------- 处理营业执照地区信息(开始) --------------------------------------
             $province_name = $product_data['province_name'];
             $city_name = $product_data['city_name'];
             //特殊地区1级移除市
@@ -132,16 +129,90 @@ class ViolationStoreDataJobs implements ShouldQueue
                         break;
                 }
             } else if ($province_name && in_array($province_name, ['内蒙古自治区', '广西壮族自治区', '西藏自治区', '新疆维吾尔自治区', '宁夏回族自治区'])) {
-            } else if (strpos($province_name, '省') === false) {
+                //完整匹配不做处理
+            } else if (trim($province_name) != '' && strpos($province_name, '省') === false) {
                 //是否存在市省，如果不存在则补全
-                if (strpos($province_name, '省') === false) {
-                    $province_name = $province_name . '省';
+                $province_name = $province_name . '省';
+            }
+            if (trim($province_name) != '') {
+                //根据最新处理后的省份名称获取省份ID
+                $db_province_id = $CitysModel->where([['name', '=', $province_name], ['level', '=', '1']])->value('id');
+                if (!empty($db_province_id)) {
+                    $product_data['province_id'] = $db_province_id;
+                }else{
+                    //逆推省份ID失败，则修改为未知名称
+                    $province_name ='未知';
+                }
+            } else {
+                //尝试从地区详情里面匹配省份名称
+                $db_province_data_list = $CitysModel->where([['level', '=', '1']])->select(['id','name'])->get()->toarray();
+                foreach ($db_province_data_list as $db_province_data) {
+                    $db_province_name = $db_province_data['name'];
+                    if (strpos($product_data['area_info'], $db_province_name) !== false) {
+                        $province_name = $db_province_name;
+                        $product_data['province_id'] = $db_province_data['id'];
+                        break;
+                    }
                 }
             }
-            // if ($city_name != '') {
-            //     $city_name_value = $CitysModel->where([['id', '=', $product_data['city_id']], ['level', '=', '2']])->value('name');
-            //     $city_name = !empty($city_name_value) ? $city_name_value : '';
-            // }
+            if (trim($city_name) != '') {
+                //校验是否存在县这个字眼
+                if (strpos($city_name, '县') !== false) {
+                    $db_city_id = $CitysModel->where([['name', '=', $city_name], ['level', '=', '2']])->value('id');
+                    if (!empty($db_city_id)) {
+                        $product_data['city_id'] = $db_city_id;
+                    }
+                } elseif (trim($city_name) != '' && strpos($city_name, '市') === false) {
+                    //是否存在市
+                    $city_name = $city_name . '市';
+                    //根据最新处理后的市名称获取市ID
+                    $db_city_id = $CitysModel->where([['name', '=', $city_name], ['level', '=', '2']])->value('id');
+                    if (!empty($db_city_id)) {
+                        $product_data['city_id'] = $db_city_id;
+                    }else{
+                        $city_name ='未知';
+                    }
+                } else {
+                    $db_city_id = $CitysModel->where([['name', '=', $city_name], ['level', '=', '2']])->value('id');
+                    if (!empty($db_city_id)) {
+                        $product_data['city_id'] = $db_city_id;
+                    }else{
+                        $city_name ='未知';
+                    }
+                }
+            } else {
+                if (trim($product_data['area_info']) != '') {
+                    //尝试从地区详情里面匹配市名称
+                    $db_city_name_list = $CitysModel->where([['level', '=', '2']])->pluck('name')->toarray();
+                    foreach ($db_city_name_list as $db_city_name) {
+                        if (strpos($product_data['area_info'], $db_city_name) !== false) {
+                            $db_city_id = $CitysModel->where([['name', '=', $db_city_name], ['level', '=', '2']])->value('id');
+                            $product_data['city_id'] = $db_city_id;
+                            $product_data['city_name'] = $db_city_name;
+                            $city_name = $db_city_name;
+                            break;
+                        }
+                    }
+                }
+            }
+            //如果存在市区city_id 则逆推省份ID以及名称
+            if (!empty($product_data['city_id']) && empty($product_data['province_id'])) {
+                $db_province_id = $CitysModel->where([['id', '=', $product_data['city_id']], ['level', '=', '2']])->value('pid');
+                $db_province_name = $CitysModel->where([['id', '=', $db_province_id], ['level', '=', '1']])->value('name');
+                $product_data['province_id'] = $db_province_id;
+                $product_data['province_name'] = $db_province_name;
+                $province_name = $db_province_name;
+            }
+            if (trim($product_data['area_info']) == '' && trim($city_name) != '' && trim($province_name) != '') {
+                $product_data['area_info'] = $province_name . $city_name;
+            }
+            //-------------------------------------- 处理营业执照地区信息(结束) --------------------------------------
+
+            //处理链接信息
+            preg_match('/https?:\/\/[^\s\'"<>]+/i', $product_data['link_url'], $matches);
+            if (!empty($matches)) {
+                $product_data['link_url'] = $matches[0];
+            }
             $store_name = $product_data['store_name'];
             $anonymous_store_name = $product_data['anonymous_store_name'];
             if ($anonymous_store_name != '') {
@@ -154,13 +225,13 @@ class ViolationStoreDataJobs implements ShouldQueue
                 'company_name'    => $product_data['company_name'],
                 'link_url'    => $product_data['link_url'],
                 'store_name'    => $store_name,
-                'social_credit_code' => $social_credit_code,
+                'social_credit_code' => $product_data['qualification_number'],
                 'province_id'    => $product_data['province_id'],
                 'province_name' => $province_name,
                 'city_id' => $product_data['city_id'],
                 'city_name' => $city_name,
                 'area_info' => $product_data['area_info'],
-                'company_category_name' => $company_category_name,
+                'company_category_name' => '',
                 'first_responsible_person' => '',
                 'responsible_person' => '',
                 'source_responsible_person' => '',

app/Jobs/Manager/Process/ViolationStoreJobs.php

@@ -9,7 +9,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use App\Facades\Servers\Logs\Log;
-use App\Models\Manager\WashConfig\ViolationCompany as ViolationCompanyModel;
+use App\Models\Manager\WashConfig\ViolationStore as ViolationStoreModel;
 use App\Models\Manager\Process\ExecuteLog as ExecuteLogModel;
 use App\Jobs\Manager\Process\ViolationStoreDataJobs;
 
@@ -41,7 +41,7 @@ class ViolationStoreJobs implements ShouldQueue
     public function handle()
     {
         try {
-            $ViolationCompanyModel = new ViolationCompanyModel();
+            $ViolationStoreModel = new ViolationStoreModel();
             $limit = isset($this->message_data['limit']) ? $this->message_data['limit'] : 50;
             $page = isset($this->message_data['page']) ? $this->message_data['page'] : 1;
             $executeLog_id = isset($this->message_data['executeLog_id']) ? $this->message_data['executeLog_id'] : 0;
@@ -53,13 +53,12 @@ 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);
             }
-            $ViolationCompanyModel = $ViolationCompanyModel->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']);
+            $ViolationStoreModel = $ViolationStoreModel->where('status', 0)->where('store_type', 1);
             if($company_id){
-                $ViolationCompanyModel = $ViolationCompanyModel->where('washconfig_violation_company.company_id', $company_id);
+                $ViolationStoreModel = $ViolationStoreModel->where('company_id', $company_id);
             }
             $totle_page = 0;
-            $list_config_data = $ViolationCompanyModel->paginate($limit, ['*'], 'page', $page)->toarray();
+            $list_config_data = $ViolationStoreModel->paginate($limit, ['*'], 'page', $page)->toarray();
             if (!$list_config_data || empty($list_config_data['data'])) {
                 if($page == 1 && $executeLog_id){
                     $ExecuteLogModel->where('id', $executeLog_id)->update(['status' => 0,'update_time'=> time()]);
@@ -73,11 +72,9 @@ class ViolationStoreJobs implements ShouldQueue
                     'company_id' => $value['company_id'],
                     'id' => $value['id'],
                     'platform' => $value['platform'],
-                    'company_type' => $value['company_type'],
-                    'company_name' => $value['company_name'],
-                    'social_credit_code' => $value['social_credit_code'],
+                    'store_type' => $value['store_type'],
+                    'store_name' => $value['store_name'],
                     'executeLog_id' => $executeLog_id,
-                    'company_category_name' => $value['category_name'],
                     'specify_responsible_person' => $value['specify_responsible_person'],
                     'item_totle_page' => $totle_page,
                     'item_now_page' => $page,

app/Models/Manager/WashConfig/ViolationStore.php

@@ -136,6 +136,7 @@ class ViolationStore extends Model
         DB::beginTransaction();
         try {
             $ViolationStore->company_id = $data['company_id'];
+            $ViolationStore->platform = $data['platform'];
             $ViolationStore->store_name = $data['store_name'];
             $ViolationStore->store_type = $data['store_type'];
             $ViolationStore->employee_ids = $data['employee_ids'];