Jelajahi Sumber

[智价云] 数据清洗省份城市名称存在时逆推失败置空错误信息,移除冗余代码

tangyuanwang 3 jam lalu
induk
melakukan
101e776a59

+ 0 - 78
app/Jobs/Manager/Process/ViolationCompanyDataJobs.php

@@ -210,84 +210,6 @@ class ViolationCompanyDataJobs implements ShouldQueue
             }
             //-------------------------------------- 处理营业执照地区信息(结束) --------------------------------------
 
-            //-------------------------------------- 处理发货省份地区信息(开始) --------------------------------------
-            $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)) {

+ 0 - 78
app/Jobs/Manager/Process/ViolationStoreDataJobs.php

@@ -207,84 +207,6 @@ class ViolationStoreDataJobs implements ShouldQueue
             }
             //-------------------------------------- 处理营业执照地区信息(结束) --------------------------------------
 
-            //-------------------------------------- 处理发货省份地区信息(开始) --------------------------------------
-            $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)) {