再补充

app/command/ImportOrderFromCAnalysisData.php

@@ -274,9 +274,9 @@ class ImportOrderFromCAnalysisData extends Command
             if ($rs['addr']) {
                 $p_c_a = get_address($rs['addr']);
 
-                $province = empty($p_c_a['province']) ? $p_c_a['province'] : Db::name('province')->whereLike('name', '%' . $p_c_a['province'] . '%')->value('province_code');
-                $city = empty($p_c_a['city']) ? $p_c_a['city'] : Db::name('city')->whereLike('name', '%' . $p_c_a['city'] . '%')->value('city_code');
-                $area = empty($p_c_a['district']) ? $p_c_a['district'] : Db::name('area')->whereLike('name', '%' . $p_c_a['district'] . '%')->value('area_code');
+                $province = Db::name('province')->where('name', $p_c_a['province'])->value('province_code', '');
+                $city = Db::name('city')->where(['name' => $p_c_a['city'], 'province_code' => $province])->value('city_code', '');
+                $area = Db::name('area')->where(['name' => $p_c_a['district'], 'city_code' => $city])->value('area_code', '');
 
                 $extend_insert_data['addr_code'] = implode([$province, $city, $area], ',');
 

app/common.php

@@ -850,7 +850,7 @@ if (!function_exists('get_address')) {
             $city = $matches[count($matches) - 2];
             $address = str_replace($city, '', $address);
         }
-        preg_match('/(.*?(区|县|镇|乡|街道|旗))/', $address, $matches);
+        preg_match('/(.*?(区|县|镇|乡|街道|旗|市))/', $address, $matches);
         if (count($matches) > 1) {
             $area = $matches[count($matches) - 2];
             $address = str_replace($area, '', $address);