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

application/models/Business/User/MemberCenterService.php

@@ -171,7 +171,6 @@ class  MemberCenterServiceModel extends \Business\AbstractModel
         $list = $favoritesInstance->getFavoritesStores(array('member_id'=>$memberId,'fav_type'=>1),'fav_from,store_id,favid');
         $brandsAround = [];
         $concernedShops = [];
-        $returnStores = [];
         if($list) {
             $storeIds = array_column($list,'store_id');
             $storeIds = implode(',',$storeIds);
@@ -188,10 +187,9 @@ class  MemberCenterServiceModel extends \Business\AbstractModel
                 }elseif($v['fav_from'] == 3){
                     $brandsAround[] = $tempStore;
                 }
-                $returnStores[] = $tempStore;
             }
         }
-        return array('concernedShop'=>$concernedShops,'brandsAround'=>$brandsAround,'stores'=>$returnStores,'totalCount'=>count($stores));
+        return array('concernedShop'=>$concernedShops,'brandsAround'=>$brandsAround,'totalCount'=>count($stores));
     }
 
     /**

application/models/DAO/Member.php

@@ -541,11 +541,16 @@ class MemberModel extends \DAO\AbstractModel
     $orders = array('member_mobile'=>'desc','member_id'=>'desc');
     $memberList = $this->getList($memberCon,$this->availMemberColumn,$orders);
     if($memberList){
-      foreach($memberList as $tempMember){
+      if(count($memberList)>1){
+        foreach($memberList as $tempMember){
           if($tempMember['member_mobile']&&\Our\Common::checkMobilePhone($tempMember['member_mobile'])){
             $member = $tempMember;
             break;
           }
+        }
+      }
+      if(empty($member)){
+        $member = $memberList[0];
       }
       $memberAvatarUrl = $this->getMemberAvatarUrl($member['member_id'], $member['member_avatar']);
       $member['memberAvatarUrl'] = $memberAvatarUrl;