[智价云] 导入更新

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

@@ -970,6 +970,7 @@ class LowPriceGoods extends Controller
         if (empty($data) || count($data) < 2) return json_send(['code' => 'error', 'msg' => '导入数据为空']);
         $result = $EmployeeModel->select(['id', 'name'])->get()->keyBy('name')->toarray();
         $platform_data = $LowPriceGoodsModel->platform_data();
+        $province_id_data = $CitysModel->get_province_id_list();
         $city_id_data = $CitysModel->get_city_id_list();
 
         DB::beginTransaction();
@@ -1012,7 +1013,7 @@ class LowPriceGoods extends Controller
                     }
                 }
                 $province_name = $item[15];
-                if (!isset($city_id_data[$province_name])) return json_send(['code' => 'error', 'msg' => "第{$key_num}行省份信息不完整", 'data' => '']);
+                if (!isset($province_id_data[$province_name])) return json_send(['code' => 'error', 'msg' => "第{$key_num}行省份信息不完整", 'data' => '']);
                 $city_name = $item[16];
                 if (!isset($city_id_data[$city_name])) return json_send(['code' => 'error', 'msg' => "第{$key_num}行城市信息不完整", 'data' => '']);
                 // 权限判断
@@ -1037,7 +1038,7 @@ class LowPriceGoods extends Controller
                 $insert_product_data['company_category_name'] = isset($item[13]) ? $item[13] : ''; // 公司分类
                 $insert_product_data['social_credit_code'] = $item[14]; // 信用代码
                 $insert_product_data['province_name'] = $item[15]; // 省份
-                $insert_product_data['province_id'] = isset($city_id_data[$province_name]) ? $city_id_data[$province_name]['id'] : 0; // 省份ID
+                $insert_product_data['province_id'] = isset($province_id_data[$province_name]) ? $province_id_data[$province_name]['id'] : 0; // 省份ID
                 $insert_product_data['city_name'] = $item[16]; // 城市
                 $insert_product_data['city_id'] = isset($city_id_data[$city_name]) ? $city_id_data[$city_name]['id'] : 0; // 城市ID
                 $insert_product_data['area_info'] = ''; // 详细地址

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

@@ -776,6 +776,7 @@ class ViolationProduct extends Controller
         if (empty($data) || count($data) < 2) return json_send(['code' => 'error', 'msg' => '导入数据为空']);
         $result = $EmployeeModel->select(['id', 'name'])->get()->keyBy('name')->toarray();
         $platform_data = $ViolationProductModel->platform_data();
+        $province_id_data = $CitysModel->get_province_id_list();
         $city_id_data = $CitysModel->get_city_id_list();
 
         DB::beginTransaction();
@@ -817,7 +818,7 @@ class ViolationProduct extends Controller
                     }
                 }
                 $province_name = $item[13];
-                if (!isset($city_id_data[$province_name])) return json_send(['code' => 'error', 'msg' => "第{$key_num}行省份信息不完整", 'data' => '']);
+                if (!isset($province_id_data[$province_name])) return json_send(['code' => 'error', 'msg' => "第{$key_num}行省份信息不完整", 'data' => '']);
                 $city_name = $item[14];
                 if (!isset($city_id_data[$city_name])) return json_send(['code' => 'error', 'msg' => "第{$key_num}行城市信息不完整", 'data' => '']);
                 // 权限判断
@@ -840,7 +841,7 @@ class ViolationProduct extends Controller
                 $insert_product_data['company_category_name'] = isset($item[11]) ? $item[11] : ''; // 公司分类
                 $insert_product_data['social_credit_code'] = $item[12]; // 信用代码
                 $insert_product_data['province_name'] = $item[13]; // 省份
-                $insert_product_data['province_id'] = isset($city_id_data[$province_name]) ? $city_id_data[$province_name]['id'] : 0; // 省份ID
+                $insert_product_data['province_id'] = isset($province_id_data[$province_name]) ? $province_id_data[$province_name]['id'] : 0; // 省份ID
                 $insert_product_data['city_name'] = $item[14]; // 城市
                 $insert_product_data['city_id'] = isset($city_id_data[$city_name]) ? $city_id_data[$city_name]['id'] : 0; // 城市ID
                 $insert_product_data['area_info'] = ''; // 详细地址