Merge branch 'lyz_cart' of http://git.shenbd.com/api-project-dev/api.shenbd.com into master_dev

application/models/Business/Goods/GoodsCommonService.php

@@ -1359,7 +1359,6 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
             }else{
                 $plusFlag=true;
             }
-
             $goodsClassStrMinus = $storeOnlineGoodsClassDao->getChangedGoodsClass(\Our\ApiConst::minus);
             if($goodsClassStrMinus&&$minusFlag==false){
                 $goodsClassMinus = unserialize($goodsClassStrMinus);
@@ -1384,6 +1383,7 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
         $oldTemp = $storeOnlineGoodsClassDao->findByWhere($goodsClass);
         if(!$oldTemp){
             $storeOnlineGoodsClassDao->insert($goodsClass);
+            \Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreOnlineGoodsClassRedisModel::getInstance(),array(&$storeOnlineGoodsClassDao, 'getStoreOnlineGoodsClassesByGcId'),array(),array($goodsClass['store_id']));
         }
         return true;
     }
@@ -1395,16 +1395,18 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
             $gcFrom = $goodsClass['gc_from'];
             $where['gc_id_1'] = $goodsClass['gc_id_1'];
             $where['gc_id_2'] = $goodsClass['gc_id_2'];
-            $where['gc_id_3'] = $goodsClass['gc_id_3'];
             $where['store_id'] = $goodsClass['store_id'];
             $where['goods_state'] = \Our\ApiConst::onlineGoodsState;
             $where['goods_verify'] = \Our\ApiConst::onlineGoodsVerify;
             if($gcFrom==\Our\ApiConst::one){
                 $where['goods_class_t_id'] = $goodsClass['gc_id_3'];
+            }else{
+                $where['gc_id_3'] = $goodsClass['gc_id_3'];
             }
             $tempOne = $goodsCommonDao->getOne($where,'goods_commonid');
             if(!$tempOne){
                 $storeOnlineGoodsClassDao->del($goodsClass);
+                \Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreOnlineGoodsClassRedisModel::getInstance(),array(&$storeOnlineGoodsClassDao, 'getStoreOnlineGoodsClassesByGcId'),array(),array($goodsClass['store_id']));
             }
         }
     }