[智价云] 省份城市导出更新

app/Jobs/Manager/Other/ExportLowPriceGoodsJobs.php

@@ -351,7 +351,7 @@ class ExportLowPriceGoodsJobs implements ShouldQueue
         $sheet = $spreadsheet->getActiveSheet();
 
         //合并单元格
-        $sheet->mergeCells('A1:U1');
+        $sheet->mergeCells('A1:AA1');
         $sheet->setCellValue('A1', '低价挂网商品导出（导出时间：' . date('Y-m-d H:i:s', time()) . ')'); // 设置合并后的单元格内容
         // 获取合并后的单元格样式对象
         $style = $sheet->getStyle('A1');
@@ -382,13 +382,11 @@ class ExportLowPriceGoodsJobs implements ShouldQueue
         $sheet->setCellValue('T2', '公司名称');
         $sheet->setCellValue('U2', '商业类型');
         $sheet->setCellValue('V2', '信用代码');
-        $sheet->setCellValue('W2', '公司省');
-        $sheet->setCellValue('X2', '公司市');
+        $sheet->setCellValue('W2', '省份');
+        $sheet->setCellValue('X2', '城市');
         $sheet->setCellValue('Y2', '处理状态');
-        $sheet->setCellValue('Z2', '店铺省');
-        $sheet->setCellValue('AA2', '店铺市');
-        $sheet->setCellValue('AB2', '采集时间');
-        $sheet->setCellValue('AC2', '清洗时间');
+        $sheet->setCellValue('Z2', '采集时间');
+        $sheet->setCellValue('AA2', '清洗时间');
 
         //平台0=全部，1=淘宝，2=京东，3=拼多多，4=美团，5=药师帮，6=1药城，7=药九九,8=药易购，9=药帮忙，10=熊猫药药11=药房网
         $platform_data = [
@@ -440,16 +438,14 @@ class ExportLowPriceGoodsJobs implements ShouldQueue
             $sheet->setCellValue('T' . $row, $item['company_name']);
             $sheet->setCellValue('U' . $row, $item['company_category_name']);
             $sheet->setCellValue('V' . $row, $item['social_credit_code']);
-            $sheet->setCellValue('W' . $row, $item['province_name']);
-            $sheet->setCellValue('X' . $row, $item['city_name']);
+            $sheet->setCellValue('W' . $row, $item['merge_province_name']);
+            $sheet->setCellValue('X' . $row, $item['merge_city_name']);
             $sheet->setCellValue('Y' . $row, isset($processing_status_text[$item['processing_status']]) ? $processing_status_text[$item['processing_status']] : '');
-            $sheet->setCellValue('Z' . $row, $item['shipment_province_name']);
-            $sheet->setCellValue('AA' . $row, $item['shipment_city_name']);
-            $sheet->setCellValue('AB' . $row, !empty($item['collection_time']) ? date('Y-m-d H:i:s', $item['collection_time']) : '');
-            $sheet->setCellValue('AC' . $row, date('Y-m-d H:i:s', $item['insert_time']));
+            $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', 'AC') as $column) {
+        foreach (range('A', 'AA') as $column) {
             $sheet->getColumnDimension($column)->setAutoSize(true);
         }
         // 创建Excel文件

app/Jobs/Manager/Other/ExportViolationProductJobs.php

@@ -341,7 +341,7 @@ class ExportViolationProductJobs implements ShouldQueue
         $sheet = $spreadsheet->getActiveSheet();
 
         //合并单元格
-        $sheet->mergeCells('A1:Q1');
+        $sheet->mergeCells('A1:W1');
         $sheet->setCellValue('A1', '禁止挂网商品导出（导出时间：' . date('Y-m-d H:i:s', time()) . ')'); // 设置合并后的单元格内容
         // 获取合并后的单元格样式对象
         $style = $sheet->getStyle('A1');
@@ -368,13 +368,11 @@ class ExportViolationProductJobs implements ShouldQueue
         $sheet->setCellValue('P2', '公司名称');
         $sheet->setCellValue('Q2', '商业类型');
         $sheet->setCellValue('R2', '信用代码');
-        $sheet->setCellValue('S2', '公司省');
-        $sheet->setCellValue('T2', '公司市');
+        $sheet->setCellValue('S2', '省份');
+        $sheet->setCellValue('T2', '城市');
         $sheet->setCellValue('U2', '处理状态');
-        $sheet->setCellValue('V2', '店铺省');
-        $sheet->setCellValue('W2', '店铺市');
-        $sheet->setCellValue('X2', '采集时间');
-        $sheet->setCellValue('Y2', '清洗时间');
+        $sheet->setCellValue('V2', '采集时间');
+        $sheet->setCellValue('W2', '清洗时间');
 
         //平台0=全部，1=淘宝，2=京东，3=拼多多，4=美团，5=药师帮，6=1药城，7=药九九,8=药易购，9=药帮忙，10=熊猫药药11=药房网
         $platform_data = [
@@ -422,16 +420,14 @@ class ExportViolationProductJobs implements ShouldQueue
             $sheet->setCellValue('P' . $row, $item['company_name']);
             $sheet->setCellValue('Q' . $row, $item['company_category_name']);
             $sheet->setCellValue('R' . $row, $item['social_credit_code']);
-            $sheet->setCellValue('S' . $row, $item['province_name']);
-            $sheet->setCellValue('T' . $row, $item['city_name']);
+            $sheet->setCellValue('S' . $row, $item['merge_province_name']);
+            $sheet->setCellValue('T' . $row, $item['merge_city_name']);
             $sheet->setCellValue('U' . $row, isset($processing_status_text[$item['processing_status']]) ? $processing_status_text[$item['processing_status']] : '');
-            $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']));
+            $sheet->setCellValue('V' . $row, !empty($item['collection_time']) ? date('Y-m-d H:i:s', $item['collection_time']) : '');
+            $sheet->setCellValue('W' . $row, date('Y-m-d H:i:s', $item['insert_time']));
             $row++;
         }
-        foreach (range('A', 'Y') as $column) {
+        foreach (range('A', 'W') as $column) {
             $sheet->getColumnDimension($column)->setAutoSize(true);
         }
         // 创建Excel文件