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

application/models/Business/Goods/GoodsClassService.php

@@ -174,9 +174,9 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
             $position['lat'] = $where['lat'];
             $position['lng'] = $where['lng'];
             $position['cityCode'] = $where['cityCode'];
-
+            ksort($position);
             $storeRedis = \Redis\Db6\StoreRedisModel::getInstance();
-            $serviceStoreKey = \Our\NameConst::serviceStoreIdsPrefix.crc32(serialize(ksort($position)));
+            $serviceStoreKey = \Our\NameConst::serviceStoreIdsPrefix.crc32(serialize($position));
             $storeRedis->update($serviceStoreKey,$serviceStoreIds,\Our\ApiConst::oneHour);
             return $serviceStoreIds;
         }
@@ -217,9 +217,10 @@ class GoodsClassServiceModel extends \Business\AbstractModel{
             $position['lat'] = $where['lat'];
             $position['lng'] = $where['lng'];
             $position['cityCode'] = $where['cityCode'];
+            ksort($position);
             $storeRedis = \Redis\Db6\StoreRedisModel::getInstance();
             if($signStoreIds){
-                $signStoreKey = \Our\NameConst::signStoreIdsPrefix.crc32(serialize(ksort($position)));
+                $signStoreKey = \Our\NameConst::signStoreIdsPrefix.crc32(serialize($position));
                 $storeRedis->update($signStoreKey,$signStoreIds,\Our\ApiConst::oneHour);
             }
             return array(

application/models/Business/Goods/GoodsCommonService.php

@@ -711,8 +711,8 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
 
 
     public function getAllNearbyGoods($position){
-
-        $redisSuffix = crc32(serialize(ksort($position)));
+        ksort($position);
+        $redisSuffix = crc32(serialize($position));
         $nearbyStoreKey = \Our\NameConst::nearbyStoreKeyPrefix . $redisSuffix;
 
         $storeRedis = \Redis\Db6\StoreRedisModel::getInstance();
@@ -752,7 +752,8 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
         $position['lat'] = $where['lat'];
         $position['lng'] = $where['lng'];
         $position['cityCode'] = $where['cityCode'];
-        $redisSuffix = crc32(serialize(ksort($position)));
+        ksort($position);
+        $redisSuffix = crc32(serialize($position));
 
         $nearbyGoodsListKey = \Our\NameConst::nearbyStoreGoodsPrefix . $redisSuffix;
 

application/models/Business/Store/StoreService.php

@@ -399,8 +399,8 @@ class StoreServiceModel extends \Business\AbstractModel{
         $position['lat'] = $where['lat'];
         $position['lng'] = $where['lng'];
         $position['cityCode'] = $where['cityCode'];
-        $readisSuffix = crc32(serialize(ksort($position)));
-
+        ksort($position);
+        $readisSuffix = crc32(serialize($position));
         $nearbyStoreIds = $this->getNearbyStoreIds($position);
         //没有得到任何附近的店铺
         if(!$nearbyStoreIds){
@@ -452,7 +452,8 @@ class StoreServiceModel extends \Business\AbstractModel{
      * @param $position
      */
     private function getNearbyStoreIds($position){
-        $readisSuffix = crc32(serialize(ksort($position)));
+        ksort($position);
+        $readisSuffix = crc32(serialize($position));
         $storeRedis = \Redis\Db6\StoreRedisModel::getInstance();
         $signStoreKey = \Our\NameConst::signStoreIdsPrefix . $readisSuffix;
         $signStoreIds =$storeRedis->find($signStoreKey, \Our\ApiConst::oneHour);
@@ -489,7 +490,8 @@ class StoreServiceModel extends \Business\AbstractModel{
         $position['lat'] = $where['lat'];
         $position['lng'] = $where['lng'];
         $position['cityCode'] = $where['cityCode'];
-        $readisSuffix = crc32(serialize(ksort($position)));
+        ksort($position);
+        $readisSuffix = crc32(serialize($position));
         $storeRedis = \Redis\Db6\StoreRedisModel::getInstance();
 
         $nearbyStoreKey = \Our\NameConst::nearbyStoreKeyPrefix . $readisSuffix;
@@ -546,9 +548,12 @@ class StoreServiceModel extends \Business\AbstractModel{
         }
         $memberStoreIds = null;
         if($memberId){
-            $storeMemberDao = \DAO\StoreMemberModel::getInstance();
-            $memberStoreIds = \Our\RedisHelper::cachedFunction(\Redis\Db0\StoreMemberRedisModel::getInstance(), array(&$storeMemberDao, 'getList'), array(array('member_id'=>$memberId,'type'=>\Our\ApiConst::storeQrcodeMember),'distinct(store_id) as store_id'), \Our\ApiConst::oneHour,array($memberId));
+            $favoritesStoreDao = \DAO\FavoritesStoreModel::getInstance();
+            $memberStoreIds = \Our\RedisHelper::cachedFunction(\Redis\Db6\FavoritesStoreRedisModel::getInstance(), array(&$favoritesStoreDao, 'selectList'), array(array('member_id'=>$memberId,'fav_from'=>\Our\ApiConst::scanFavor),'distinct(store_id) as store_id'), \Our\ApiConst::oneHour,array($memberId));
             //$storeMemberDao->getList(array('member_id'=>$memberId,'type'=>\Our\ApiConst::storeQrcodeMember),'distinct(store_id) as store_id')
+            if($memberStoreIds){
+                $memberStoreIds = array_column($memberStoreIds,'store_id');
+            }
         }
 
 
@@ -571,6 +576,9 @@ class StoreServiceModel extends \Business\AbstractModel{
                 $returnStores = array();
                 $returnStores['gcName'] = $goodsClass['gcName'];
                 $existStoreIds = null;
+                $returnStores['stores'] = null;
+                $exitStore = array();
+                $purchasedStore = array();
                 if($signStores&&in_array($goodsClass['gcId'],array_keys($signStores))){//如果当前分类存在对应签约店铺
                     $exitStore = $allStores[$signStores[$goodsClass['gcId']]];
                     $existStoreIds = $signStores[$goodsClass['gcId']];
@@ -581,30 +589,31 @@ class StoreServiceModel extends \Business\AbstractModel{
                     $exitStore = $allStores[$expressStores[$goodsClass['gcId']]];
                     $existStoreIds = $expressStores[$goodsClass['gcId']];
                 }
-                if(isset($exitStore)&&$exitStore){
-                    $returnStores['stores'][] =$exitStore;
-                }
                 if($memberStoreIds){
                     $existSignStores = array_intersect($signStores,$memberStoreIds);
                     $existServiceStores = array_intersect($serviceStores,$memberStoreIds);
                     $existExpressStores = array_intersect($expressStores,$memberStoreIds);
-                    $purchasedStore = null;
                     if($existSignStores&&in_array($goodsClass['gcId'],array_keys($existSignStores))&&$existSignStores[$goodsClass['gcId']]!=$existStoreIds){
                         $purchasedStore = $allStores[$existSignStores[$goodsClass['gcId']]];
-                        $returnStores['stores'][] = $allStores[$existSignStores[$goodsClass['gcId']]];
                     }else if($existServiceStores&&in_array($goodsClass['gcId'],array_keys($existServiceStores))&&$existServiceStores[$goodsClass['gcId']]!=$existStoreIds){
                         $purchasedStore = $allStores[$existServiceStores[$goodsClass['gcId']]];
-                        $returnStores['stores'][] = $allStores[$existServiceStores[$goodsClass['gcId']]];
                     }else if($existExpressStores&&in_array($goodsClass['gcId'],array_keys($existExpressStores))&&$existExpressStores[$goodsClass['gcId']]!=$existStoreIds){
                         $purchasedStore = $allStores[$existExpressStores[$goodsClass['gcId']]];
-                        $returnStores['stores'][] = $allStores[$existExpressStores[$goodsClass['gcId']]];
                     }
                     if($purchasedStore){
                         $purchasedStore['isPurchased'] = \Our\ApiConst::one;
-                        $returnStores['stores'][] = $purchasedStore;
                     }
                 }
-
+                if($exitStore&&$purchasedStore&&$exitStore['storeId']==$purchasedStore['storeId']){
+                    $returnStores['stores'][] = $purchasedStore;
+                }else{
+                    if(isset($exitStore)&&$exitStore){
+                        $returnStores['stores'][] =$exitStore;
+                    }
+                    if(isset($purchasedStore)&&$purchasedStore){
+                        $returnStores['stores'][] =$purchasedStore;
+                    }
+                }
                 if($returnStores['stores']){
                     $return[] = $returnStores;
                 }
@@ -623,10 +632,10 @@ class StoreServiceModel extends \Business\AbstractModel{
      * @param $position
      */
     public function getSignClassStores($gcId,$position){
-
+        ksort($position);
         //第一步:获取当前地址对应店铺是否包含当前分类(签约)
         $storeRedis = \Redis\Db6\StoreRedisModel::getInstance();
-        $signStoreKey = \Our\NameConst::signStoreIdsPrefix.crc32(serialize(ksort($position)));
+        $signStoreKey = \Our\NameConst::signStoreIdsPrefix.crc32(serialize($position));
         $signStoreIds = $storeRedis->find($signStoreKey, \Our\ApiConst::oneHour);
         //签约店铺存在
         if($signStoreIds){
@@ -643,10 +652,10 @@ class StoreServiceModel extends \Business\AbstractModel{
      * @return array|bool
      */
     public function getServiceClassStores($gcId,$position){
-
+        ksort($position);
         $storeRedis = \Redis\Db6\StoreRedisModel::getInstance();
-        $signStoreKey = \Our\NameConst::signStoreIdsPrefix.crc32(serialize(ksort($position)));
-        $serviceStoreKey = \Our\NameConst::serviceStoreIdsPrefix.crc32(serialize(ksort($position)));
+        $signStoreKey = \Our\NameConst::signStoreIdsPrefix.crc32(serialize($position));
+        $serviceStoreKey = \Our\NameConst::serviceStoreIdsPrefix.crc32(serialize($position));
         $signStoreIds = $storeRedis->find($signStoreKey, \Our\ApiConst::oneHour);
         $serviceStoreIds = $storeRedis->find($serviceStoreKey, \Our\ApiConst::oneHour);
         if($signStoreIds&&$serviceStoreIds){
@@ -661,10 +670,11 @@ class StoreServiceModel extends \Business\AbstractModel{
     }
 
     public function getExpressStores($gcId,$position){
+        ksort($position);
         $storeDao = \DAO\StoreModel::getInstance();
         $storeRedis = \Redis\Db6\StoreRedisModel::getInstance();
-        $signStoreKey = \Our\NameConst::signStoreIdsPrefix.crc32(serialize(ksort($position)));
-        $serviceStoreKey = \Our\NameConst::serviceStoreIdsPrefix.crc32(serialize(ksort($position)));
+        $signStoreKey = \Our\NameConst::signStoreIdsPrefix.crc32(serialize($position));
+        $serviceStoreKey = \Our\NameConst::serviceStoreIdsPrefix.crc32(serialize($position));
         $signStoreIds = $storeRedis->find($signStoreKey, \Our\ApiConst::oneHour);
         $serviceStoreIds = $storeRedis->find($serviceStoreKey, \Our\ApiConst::oneHour);
         $expressStores = $storeDao->getExpressStores('store_id');

application/models/DAO/FavoritesStore.php

@@ -27,6 +27,7 @@ class FavoritesStoreModel extends \DAO\AbstractModel {
     public function init(){
 
     }
+
     public function getList($where,$field,$pageIndex,$pageSize,$memberId){
         $this->setDb($this->dbName);
         return $this->db->select($field)->from($this->_tableName)->join('han_store',"han_favorites_store.store_id = han_store.store_id",'inner')->join('han_store_score_statistics',"han_favorites_store.store_id = han_store_score_statistics.store_id",'left')->where(['han_favorites_store.member_id'=>$memberId,'fav_type'=>1])->where($where)->page($pageIndex,$pageSize)->order('fav_time','DESC')->fetchAll();
@@ -47,15 +48,30 @@ class FavoritesStoreModel extends \DAO\AbstractModel {
 
     public function insert($param){
         $this->setDb(\Our\DbNameConst::masterDBConnectName);
-        return $this->db->insert($this->_tableName)->rows($param)->execute();
+        $result = $this->db->insert($this->_tableName)->rows($param)->execute();
+        if($result){
+            if($param&&(isset($param['member_id'])&&$param['member_id'])){
+                \Our\RedisHelper::delCachedFunction(\Redis\Db6\FavoritesStoreRedisModel::getInstance(), array(&$this, 'selectList'), array() ,array($param['member_id']));
+            }
+        }
+        return $result;
     }
 
     public function update($param,$where,$del = false,$memberId = null){
         $this->setDb(\Our\DbNameConst::masterDBConnectName);
         if($del){
-            return $this->db->update($this->_tableName)->rows($param)->where(array('member_id'=>$memberId))->where($where)->execute();
+            $result  = $this->db->update($this->_tableName)->rows($param)->where(array('member_id'=>$memberId))->where($where)->execute();
+            if($result){
+                \Our\RedisHelper::delCachedFunction(\Redis\Db6\FavoritesStoreRedisModel::getInstance(), array(&$this, 'selectList'), array() ,array($memberId));
+            }
+            return $result;
         }
-        return $this->db->update($this->_tableName)->rows($param)->where($where)->execute();
+        $result = $this->db->update($this->_tableName)->rows($param)->where($where)->execute();
+        if($result){
+            $temp = $this->getOne('member_id',$param);
+            \Our\RedisHelper::delCachedFunction(\Redis\Db6\FavoritesStoreRedisModel::getInstance(), array(&$this, 'selectList'), array() ,array($temp['member_id']));
+        }
+        return $result;
     }
     public function getFavoritesStoreCount($where){
         $this->setDb($this->dbName);
@@ -84,7 +100,13 @@ class FavoritesStoreModel extends \DAO\AbstractModel {
         $this->setDb(\Our\DbNameConst::masterDBConnectName);
         $baseSql = "insert  into {$this->_tableName}(member_id,store_id,fav_type,fav_time) values({0},{1},1,{2}) ON DUPLICATE KEY UPDATE fav_type=1,fav_time=VALUES (fav_time)";
         $sql = \Our\Common::format($baseSql, $data['member_id'], $data['store_id'],$data['fav_time']);
-        return $this->db->insert($this->_tableName)->query($sql);
+        $result = $this->db->insert($this->_tableName)->query($sql);
+        if($result){
+            if($data&&(isset($data['member_id'])&&$data['member_id'])){
+                \Our\RedisHelper::delCachedFunction(\Redis\Db6\FavoritesStoreRedisModel::getInstance(), array(&$this, 'selectList'), array() ,array($data['member_id']));
+            }
+        }
+        return $result;
     }
 
     public function insertAll($datas){
@@ -94,6 +116,7 @@ class FavoritesStoreModel extends \DAO\AbstractModel {
         $insertAllSql = $baseSql;
         for ($i = 0; $i < count($datas); $i++) {
             $addSql = \Our\Common::format("('{0}','{1}','{2}','{3}'),", $datas[$i]['member_id'], $datas[$i]['store_id'], $datas[$i]['fav_from'],TIMESTAMP);
+            \Our\RedisHelper::delCachedFunction(\Redis\Db6\FavoritesStoreRedisModel::getInstance(), array(&$this, 'selectList'), array() ,array($datas[$i]['member_id']));
             $insertAllSql .= $addSql;
             if ($i % 1000 == 0 && $i != 0) {
                 $insertAllSql = rtrim($insertAllSql, ',');
@@ -130,6 +153,7 @@ class FavoritesStoreModel extends \DAO\AbstractModel {
         $sql = "INSERT INTO {$this->_tableName} ( store_id,member_id,fav_from,fav_time) values";
         foreach($datas as $key => $data){
             $sql .=\Our\Common::format(" (store_id={0} and member_id = {1} and fav_from={2} ),",$data['storeId'],$data['memberId'],$data['type']);
+            \Our\RedisHelper::delCachedFunction(\Redis\Db6\FavoritesStoreRedisModel::getInstance(), array(&$this, 'selectList'), array() ,array($data['memberId']));
         }
         $sql = trim($sql,',');
         $sql .= ";";
@@ -164,6 +188,7 @@ class FavoritesStoreModel extends \DAO\AbstractModel {
         $insertAllSql = $baseSql;
         for ($i = 0; $i < count($datas); $i++) {
             $addSql = \Our\Common::format("('{0}','{1}','{2}','{3}'),", $datas[$i]['member_id'], $datas[$i]['store_id'], $datas[$i]['fav_time'], $datas[$i]['fav_from']);
+            \Our\RedisHelper::delCachedFunction(\Redis\Db6\FavoritesStoreRedisModel::getInstance(), array(&$this, 'selectList'), array() ,array($datas[$i]['member_id']));
             $insertAllSql .= $addSql;
             if ($i % 1000 == 0 && $i != 0) {
                 $insertAllSql = rtrim($insertAllSql, ',');