|
@@ -52,25 +52,52 @@ class Address extends Base
|
|
|
if ($data['county']) {
|
|
|
|
|
|
$info = Dever::db('area/county')->find($data['county']);
|
|
|
- $data['county_name'] = $info['name'];
|
|
|
+ if ($info) {
|
|
|
+ $data['county_name'] = $info['name'];
|
|
|
|
|
|
- if (!$data['city']) {
|
|
|
- $data['city'] = $info['city_id'];
|
|
|
- }
|
|
|
+ if (!$data['city']) {
|
|
|
+ $data['city'] = $info['city_id'];
|
|
|
+ }
|
|
|
+
|
|
|
+ $info = Dever::db('area/city')->find($data['city']);
|
|
|
+ $data['city_name'] = $info['name'];
|
|
|
+
|
|
|
+ if (!$data['province']) {
|
|
|
+ $data['province'] = $info['province_id'];
|
|
|
+ }
|
|
|
|
|
|
- $info = Dever::db('area/city')->find($data['city']);
|
|
|
- $data['city_name'] = $info['name'];
|
|
|
+ $info = Dever::db('area/province')->find($data['province']);
|
|
|
+ $data['province_name'] = $info['name'];
|
|
|
|
|
|
- if (!$data['province']) {
|
|
|
- $data['province'] = $info['province_id'];
|
|
|
+ //$data['address_info'] = $data['province_name'] . $data['city_name'] . $data['county_name'] .','. $data['address'] .','. $data['house_number'];
|
|
|
+ $data['add_string'] = $data['province_name'] . $data['city_name'] . $data['county_name'] .','. $data['address'] .','. $data['house_number'] .','. $data['contact'] .','. $data['mobile'];
|
|
|
}
|
|
|
+ } elseif ($data['city']) {
|
|
|
|
|
|
- $info = Dever::db('area/province')->find($data['province']);
|
|
|
- $data['province_name'] = $info['name'];
|
|
|
+ $info = Dever::db('area/county')->find($data['city']);
|
|
|
+ if ($info) {
|
|
|
+ $data['county_name'] = $info['name'];
|
|
|
|
|
|
- //$data['address_info'] = $data['province_name'] . $data['city_name'] . $data['county_name'] .','. $data['address'] .','. $data['house_number'];
|
|
|
- $data['add_string'] = $data['province_name'] . $data['city_name'] . $data['county_name'] .','. $data['address'] .','. $data['house_number'] .','. $data['contact'] .','. $data['mobile'];
|
|
|
- } else {
|
|
|
+ if (!$data['city']) {
|
|
|
+ $data['city'] = $info['city_id'];
|
|
|
+ }
|
|
|
+
|
|
|
+ $info = Dever::db('area/city')->find($data['city']);
|
|
|
+ $data['city_name'] = $info['name'];
|
|
|
+
|
|
|
+ if (!$data['province']) {
|
|
|
+ $data['province'] = $info['province_id'];
|
|
|
+ }
|
|
|
+
|
|
|
+ $info = Dever::db('area/province')->find($data['province']);
|
|
|
+ $data['province_name'] = $info['name'];
|
|
|
+
|
|
|
+ //$data['address_info'] = $data['province_name'] . $data['city_name'] . $data['county_name'] .','. $data['address'] .','. $data['house_number'];
|
|
|
+ $data['add_string'] = $data['province_name'] . $data['city_name'] . $data['county_name'] .','. $data['address'] .','. $data['house_number'] .','. $data['contact'] .','. $data['mobile'];
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ if (!$data['county_name']) {
|
|
|
$city = '';
|
|
|
if (strstr($data['address'], '省')) {
|
|
|
$temp = explode('省', $data['address']);
|