地址相关修改

application/models/Business/User/AddressService.php

@@ -76,12 +76,17 @@ class AddressServiceModel extends \Business\AbstractModel {
         $sess=\Yaf\Session::getInstance();
         $currentAddress = $sess->get('currentAddress');
         //if($currentAddress)
-        if(isset($data['choosedFlag'])&&$data['choosedFlag']){
+        if((isset($data['choosedFlag'])&&$data['choosedFlag'])){
             $chooseFlag = $data['choosedFlag'];
+        }else if(!$memberId){
+            $chooseFlag = \Our\ApiConst::one;
         }
+        $returnAddress = array();
         if(isset($data['addressId'])&&$data['addressId']){
             $returnAddress = $this->setAddressById($data['addressId'],$memberId);
-        }else if(($data['lng']&&$data['lat']&&$data['cityCode'])){
+        }
+        if(!$returnAddress){
+            if(($data['lng']&&$data['lat']&&$data['cityCode'])){
                 if(isset($chooseFlag)&&$chooseFlag){
                     $returnAddress = $this->setCurrentAddress($data,$memberId,$chooseFlag);
                 }else{
@@ -117,10 +122,13 @@ class AddressServiceModel extends \Business\AbstractModel {
                         \Error\ErrorModel::throwException(\Error\CodeConfigModel::illegalAccess);
                     }
                     $data = \Our\ArrayConst::defaultAddress; //如果没有传任何地址信息,系统提供默认地址
-                $returnAddress = $this->setCurrentAddress($data,$memberId);
+
+                    $returnAddress = $this->setCurrentAddress($data,$memberId,$memberId?\Our\ApiConst::zero:\Our\ApiConst::one);
                 }
             }
-        if(isset($data['choosedFlag'])&&$data['choosedFlag']){ //如果调用设置地址接口时,前台不需要弹窗
+
+        }
+        if((isset($data['choosedFlag'])&&$data['choosedFlag'])||!$memberId){ //如果调用设置地址接口时,前台不需要弹窗
             $returnAddress['choosedAddressFlag'] = \Our\ApiConst::one;
         }
         return $returnAddress;
@@ -134,9 +142,10 @@ class AddressServiceModel extends \Business\AbstractModel {
         if(!$addressId){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::illegalAccess);
         }
-        $address = $this->getMyAddress(array('addressId'=>$addressId),$memberId);
+        $address = $this->getMyAddress(array('addressId'=>$addressId),$memberId,false);
         if(!$address){
-            \Error\ErrorModel::throwException(\Error\CodeConfigModel::addressNotExist);
+            //\Error\ErrorModel::throwException(\Error\CodeConfigModel::addressNotExist);
+            return array();
         }
         $sess = \Yaf\Session::getInstance();
         $newAddress['addressId'] = $address['addressId'];
@@ -342,10 +351,11 @@ class AddressServiceModel extends \Business\AbstractModel {
      * 获取单个收货地址
      * @param $where
      * @param $memberId
+     * @param $validFlag 地址不存在是否需要抛出异常
      * @return array|bool|mixed
      * @throws \Exception
      */
-    public function getMyAddress($where,$memberId){
+    public function getMyAddress($where,$memberId,$validFlag = true){
         $addressDao = \DAO\AddressModel::getInstance();
         $columns = $addressDao->getAddressColumns();
         if($where['addressId']){
@@ -354,7 +364,7 @@ class AddressServiceModel extends \Business\AbstractModel {
             $address = \Our\RedisHelper::cachedFunction(\Redis\Db8\AddressRedisModel::getInstance(),array(&$addressDao, 'findByWhereWithColumns'),array($condition,$columns),3600,array($addressId));
 
             //$address = $this->findFromRedis($condition,'han_address','address_id',$columns);
-            if(!$address||($address&&$address['member_id']!=$memberId)){
+            if((!$address||($address&&$address['member_id']!=$memberId))&&$validFlag){
                 \Error\ErrorModel::throwException(\Error\CodeConfigModel::addressNotExist);
             }
         };