下架店铺移除扫码关系

application/models/Business/User/MemberService.php

@@ -1125,7 +1125,16 @@ class MemberServiceModel extends \Business\AbstractModel
             if($keys = $favoritesRedis->tableKeys('myFavoritesStore'.$favoritesRedis::DELIMITER.$memberId.'_')) {
                 $storeId = $favoritesRedis->tableCacheGet($keys[0]);
             }else{
-                $favStore = $favoritesDao->getStoreAndFavoriteStore('han_store.store_id',array('fav_from'=>\Our\ApiConst::scanFavor,'han_favorites_store.member_id'=>$memberId,'open_flag'=>1,'store_state'=>1));
+                $storeIds = $favoritesDao->getStoreAndFavoriteStore('han_store.store_id',array('fav_from'=>\Our\ApiConst::scanFavor,'han_favorites_store.member_id'=>$memberId,'open_flag|store_state'=>0),array());
+                if($storeIds) {
+                    $storeIds = array_column($storeIds,'store_id');
+                    $return = $favoritesDao->update(array('fav_type'=>0,'fav_from'=>0),'store_id in ('.implode(',',$storeIds).')',true,$memberId);
+                    if($return) {
+                        $favoritesDao->updateStoreCollecitonsCache($storeIds, $memberId);
+                    }
+                }
+                $favStore = $favoritesDao->getOne('store_id',array('fav_from'=>\Our\ApiConst::scanFavor,'member_id'=>$memberId));
+//                $favStore = $favoritesDao->getStoreAndFavoriteStore('han_store.store_id',array('fav_from'=>\Our\ApiConst::scanFavor,'han_favorites_store.member_id'=>$memberId,'open_flag'=>1,'store_state'=>1),array('fav_time'=>'desc','favid'=>'desc'),array(0,1));
                 if($favStore&&$favStore['store_id']){
                     $storeId = $favStore['store_id'];
                 }else{

application/models/DAO/FavoritesStore.php

@@ -58,14 +58,20 @@ class FavoritesStoreModel extends \DAO\AbstractModel {
         $result = $this->db->select($field)->from($this->_tableName)->where($where)->fetchOne();
         return $result;
     }
-    public function getStoreAndFavoriteStore($field,$where,$order = array('fav_time'=>'desc','favid'=>'desc')) {
+    public function getStoreAndFavoriteStore($field,$where,$order = array('fav_time'=>'desc','favid'=>'desc'),$limit = null) {
         $this->setDb($this->dbName);
         if($order){
             foreach($order as $key=>$value){
                 $this->db->order($key,$value);
             }
         }
-        $result = $this->db->select($field)->from($this->_tableName)->join('han_store','han_store.store_id = han_favorites_store.store_id','inner')->where($where)->fetchOne();
+        if($limit) {
+            $this->db->limit($limit[0],$limit[1]);
+        }
+        if(is_array($where)){
+            $where=$this->db->getSqlWhereByArray($where);
+        }
+        $result = $this->db->select($field)->from($this->_tableName)->join('han_store','han_store.store_id = han_favorites_store.store_id','inner')->where($where)->fetchAll();
         return $result;
     }
     public function insert($param){