[智价云] 优化调整地区信息

app/Jobs/Manager/Process/LowPriceGoodsDataJobs.php

@@ -251,27 +251,21 @@ class LowPriceGoodsDataJobs implements ShouldQueue
             }
         }
         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 = '未知';
-                }
+            $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 {
-                $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 {
+                if (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{
                     $city_name = '未知';
                 }
             }
@@ -346,30 +340,23 @@ class LowPriceGoodsDataJobs implements ShouldQueue
             }
         }
         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 = '未知';
-                }
+            $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 {
-                $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 (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{
+                    $city_name = '未知';
                 }
             }
         }

app/Jobs/Manager/Process/ViolationCompanyDataJobs.php

@@ -159,27 +159,21 @@ class ViolationCompanyDataJobs implements ShouldQueue
             }
         }
         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 = '未知';
-                }
+            $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 {
-                $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 {
+                if (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{
                     $city_name = '未知';
                 }
             }
@@ -211,7 +205,7 @@ class ViolationCompanyDataJobs implements ShouldQueue
         }
         //-------------------------------------- 处理营业执照地区信息(结束) --------------------------------------
 
-//-------------------------------------- 处理发货省份地区信息(开始) --------------------------------------
+        //-------------------------------------- 处理发货省份地区信息(开始) --------------------------------------
         $shipment_province_name = $product_data['shipment_province_name'];
         $shipment_city_name = $product_data['shipment_city_name'];
         //特殊地区1级移除市
@@ -254,30 +248,23 @@ class ViolationCompanyDataJobs implements ShouldQueue
             }
         }
         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 = '未知';
-                }
+            $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 {
-                $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 (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{
+                    $city_name = '未知';
                 }
             }
         }

app/Jobs/Manager/Process/ViolationProductDataJobs.php

@@ -180,9 +180,7 @@ class ViolationProductDataJobs implements ShouldQueue
                 return true;
             }
         }
-        //-------------------------------------- 清洗规则(结束) --------------------------------------
-
-
+        //-------------------------------------- 清洗规则(结束) -------------------------------------------------
 
         //-------------------------------------- 处理营业执照地区信息(开始) --------------------------------------
         $province_name = $product_data['province_name'];
@@ -238,27 +236,21 @@ class ViolationProductDataJobs implements ShouldQueue
             }
         }
         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 = '未知';
-                }
+            $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 {
-                $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 {
+                if (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{
                     $city_name = '未知';
                 }
             }
@@ -333,30 +325,23 @@ class ViolationProductDataJobs implements ShouldQueue
             }
         }
         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 = '未知';
-                }
+            $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 {
-                $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 (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{
+                    $city_name = '未知';
                 }
             }
         }