地址不必填

app/admin/controller/Purch.php

@@ -315,7 +315,7 @@ class Purch extends Base
         if (!empty($addr)) {
             foreach ($addr as &$vv){
                 $temp = explode(',', $vv['addr_code']);
-                $temp_ = GetAddr(json_encode(['provice_code' => $temp[0], 'city_code' => $temp[1], 'area_code' => $temp[2]]));
+                $temp_ = GetAddr(json_encode(['provice_code' => isset($temp[0]) ? $temp[0] : '', 'city_code' => isset($temp[1]) ? $temp[1] : '', 'area_code' => isset($temp[2]) ? $temp[2] : '']));
                 $vv['addr_code'] = $temp_ . $vv['addr'];
             }
         }else $addr=[];

app/command/ImportOrderFromCAnalysisData.php

@@ -262,9 +262,10 @@ class ImportOrderFromCAnalysisData extends Command
             //省市区
             if ($rs['addr']) {
                 $p_c_a = get_address($rs['addr']);
-                $province = Db::name('province')->whereLike('name', '%' . $p_c_a['province'] . '%')->value('province_code');
-                $city = Db::name('city')->whereLike('name', '%' . $p_c_a['city'] . '%')->value('city_code');
-                $area = Db::name('area')->whereLike('name', '%' . $p_c_a['district'] . '%')->value('area_code');
+
+                $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');
 
                 $extend_insert_data['addr_code'] = implode([$province, $city, $area], ',');