Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into ccw

application/models/Business/User/AddressService.php

@@ -102,11 +102,11 @@ class AddressServiceModel extends \Business\AbstractModel {
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::addressNotExist);
         }
         $sess = \Yaf\Session::getInstance();
-        $newAddress['addressId'] = $address['address_id'];
+        $newAddress['addressId'] = $address['addressId'];
         $newAddress['address'] = $address['address'];
-        $newAddress['tagType'] = $address['tag_type'];
+        $newAddress['tagType'] = $address['tagType'];
         $returnAddresses[] = $newAddress;
-        $choosedAddressId = $address['address_id'];
+        $choosedAddressId = $address['addressId'];
         $newAddress = $address;
         $newAddress['lng']  = $address['lng'];
         $newAddress['lat']  = $address['lat'];
@@ -265,7 +265,6 @@ class AddressServiceModel extends \Business\AbstractModel {
      * @throws \Exception
      */
     public function getMyAddress($where,$memberId){
-
         $addressDao = \DAO\AddressModel::getInstance();
         $columns = $addressDao->getAddressColumns();
         if($where['addressId']){
@@ -277,7 +276,7 @@ class AddressServiceModel extends \Business\AbstractModel {
             if(!$address||($address&&$address['member_id']!=$memberId)){
                 \Error\ErrorModel::throwException(\Error\CodeConfigModel::addressNotExist);
             }
-        }
+        };
         if($address){
             $address = \Our\Common::convertUnderline($address);
             $address['subAddress']  = $address['subaddress'];