地址管理相关

application/models/Business/User/AddressService.php

@@ -392,6 +392,7 @@ class AddressServiceModel extends \Business\AbstractModel {
         $address['subaddress']  = $data['subAddress'];
         $address['citycode']    = $data['cityCode'];
         $address['address']     = $data['address'];
+        $address['name']        = $data['name'];
         $address['member_id']   = $memberId;
         $address['lng']         = $data['lng'];
         $address['lat']         = $data['lat'];
@@ -399,6 +400,9 @@ class AddressServiceModel extends \Business\AbstractModel {
         $city_id =0;
         $area_id = 0;
         $areaList= \Our\AreaConst::areaList;
+        if(!($address['address']&&$address['name'])){
+            \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyAddressAndName);
+        }
         if($province){
             $province = mb_substr($province,0,2);
             $provinceList = $areaList[\Our\ApiConst::zero];
@@ -463,9 +467,9 @@ class AddressServiceModel extends \Business\AbstractModel {
         if(!($address['lng']&&$address['lat'])){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::chooseAddressFormMap);
         }
-        if(!$address['subaddress']){
+        /*if(!$address['subaddress']){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptySubAddress);
-        }
+        }*/
         return $address;
 
     }

application/models/DAO/Address.php

@@ -244,6 +244,7 @@ class AddressModel extends \DAO\AbstractModel {
             'member_id',
             'area_info',
             'address',
+            'name',
             'mob_phone',
             'tel_phone',
             'is_default',

application/models/Error/CodeConfig.php

@@ -352,6 +352,7 @@ class CodeConfigModel {
     const emptyProvinceId = 140018;
     const emptyCityId = 140019;
     const emptyDistrictId = 140020;
+    const emptyAddressAndName = 140021;
 
     //消息，推送等
     const removeMessage=150001;
@@ -577,6 +578,7 @@ class CodeConfigModel {
             self::emptyProvinceId => '找不到对应省份',
             self::emptyCityId => '找不到对应城市',
             self::emptyDistrictId => '找不到对应区',
+            self::emptyAddressAndName => '地址和具体街道不能为空',
 
             self::emptyLatLng => '经纬度不能为空',
             self::emptyCityCode => '高德地图城市编码不能为空',