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

application/models/Business/User/AddressService.php

@@ -164,13 +164,8 @@ class AddressServiceModel extends \Business\AbstractModel {
                 $address['chooseFlag'] = $chooseFlag;
             }else{
                 $address['chooseFlag'] = \Our\ApiConst::zero;
-
-                \Our\Log::getInstance()->write(json_encode($tempLatLng));
-                \Our\Log::getInstance()->write(json_encode($currentAddress));
-                \Our\Log::getInstance()->write(json_encode($where));
                 if($currentAddress&&$tempLatLng&&!(isset($where['default'])&&$where['default'])){
                     $sameFlag = $addressDao->checkSessAddress($tempLatLng,$currentAddress);
-                    \Our\Log::getInstance()->write($sameFlag.'samFlag');
                     if($sameFlag){
                         $address['chooseFlag'] = \Our\ApiConst::one;
                     }

application/models/DAO/Address.php

@@ -190,7 +190,8 @@ class AddressModel extends \DAO\AbstractModel {
     }
 
     public function  checkSessAddress($tempAddress,$sessAddress){
-        if($tempAddress['lat']==$sessAddress['lat']&&$tempAddress['lng']==$sessAddress['lng']&&$tempAddress['cityCode']==$sessAddress['cityCode']&&(isset($sessAddress['chooseFlag'])&&$sessAddress['chooseFlag'])){
+        $distance = \Our\CommonExtension::getDistance($tempAddress['lat'],$tempAddress['lng'],$sessAddress['lat'],$sessAddress['lng']);
+        if($distance<=\Our\ApiConst::minDistanceForCurrentPosition&&(isset($sessAddress['chooseFlag'])&&$sessAddress['chooseFlag'])){
             return true;
         }
         return false;