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

application/models/Business/Store/StoreService.php

@@ -48,14 +48,17 @@ class StoreServiceModel extends \Business\AbstractModel{
                 $storeMember['fav_type'] = \Our\ApiConst::one;
                 $storeMembers[] = $storeMember;
                 $favoritesStoreDao = \DAO\FavoritesStoreModel::getInstance();
-                $one = $favoritesStoreDao->selectList(array('store_id'=>$storeId,'member_id'=>$memberId,'fav_type'=>0),'store_id');
-                $one && $storeIds = array($one['store_id']);
+                $one = $favoritesStoreDao->selectList(array('store_id'=>$storeId,'member_id'=>$memberId,'fav_type'=>\Our\ApiConst::one,'fav_from'=>\Our\ApiConst::scanFavor),'store_id');
+                if(!$one) {
                     $result = $favoritesStoreDao->insertAll($storeMembers);
-                if($result) {
-                    $favoritesStoreDao->updateStoreCollecitonsCache($storeIds,$memberId,2);
-                }
+//                    if($result) {
+//                        $favoritesStoreDao->updateStoreCollecitonsCache(array($storeId),$memberId,2);
+//                    }
+                    $favoritesStoreDao->updateStoreCollecitonsCache(array($storeId),$memberId,2);
                     $favoritesDao = \DAO\FavoritesStoreModel::getInstance();
                     \Our\RedisHelper::delCachedFunction(\Redis\Db6\FavoritesStoreRedisModel::getInstance(),array(&$favoritesDao, 'getOne'),array(),array($memberId));
+                }
+
             }else{
                 $sess=\Yaf\Session::getInstance();
                 $scan_store_ids = $sess->get('scan_store_ids');
@@ -384,7 +387,7 @@ class StoreServiceModel extends \Business\AbstractModel{
         }
         $return = $FavoritesStoreInstance->insertOrUpdate(array('member_id'=>$memberId,'store_id'=>$storeId,'fav_time'=>time(),'fav_type'=>1,'fav_from'=>1));
 
-        if((int)$return > 0){
+        if($return){
             $FavoritesStoreInstance->updateStoreCollecitonsCache(array($storeId),$memberId,2);
             return true;
         }

application/models/Business/User/MemberService.php

@@ -358,8 +358,11 @@ class MemberServiceModel extends \Business\AbstractModel
             $result = $storeMemberDao->addBatch($storeMember);*/
             $favoritesStoreDao = \DAO\FavoritesStoreModel::getInstance();
             $storeIds = array_column($scan_store_ids,'store_id');
-            $list = $favoritesStoreDao->selectList(array('store_id'=>array('in',$storeIds),'member_id'=>$memberId,'fav_type'=>0),'store_id');
-            $list && $storeIds = array_column($list, 'store_id');
+            //$list = $favoritesStoreDao->selectList(array('store_id'=>array('in',$storeIds),'member_id'=>$memberId,'fav_type'=>0),'store_id');
+            $list = $favoritesStoreDao->selectList(array('store_id'=>array('in',$storeIds),'member_id'=>$memberId,'fav_type'=>\Our\ApiConst::one,'fav_from'=>\Our\ApiConst::scanFavor),'store_id');
+            $storeIds2 = $list ? array_column($list, 'store_id') : [];
+            $storeIds = array_diff($storeIds,$storeIds2);
+            if($storeIds) {
                 $result = $favoritesStoreDao->insertAll($storeMembers);
                 if(!$result){
                     \Our\Log::getInstance()->write(json_encode($storeMembers).'扫码数据写入失败');
@@ -369,6 +372,8 @@ class MemberServiceModel extends \Business\AbstractModel
                 $favoritesDao = \DAO\FavoritesStoreModel::getInstance();
                 \Our\RedisHelper::delCachedFunction(\Redis\Db6\FavoritesStoreRedisModel::getInstance(),array(&$favoritesDao, 'getOne'),array(),array($memberId));
             }
+
+        }
         $scan_sale_ids = $sess->get('scan_sale_ids');
         if($scan_sale_ids){
             $saleIds = array_keys($scan_sale_ids);