组合销售不能移入收藏夹

application/models/Business/Cart/CartService.php

@@ -512,10 +512,12 @@ class CartServiceModel extends \Business\AbstractModel{
         $favoritesDao = \DAO\FavoritesModel::getInstance(\Our\DbNameConst::masterDBConnectName);
         $cartDao->db->doTransaction();
         $favList = array();
+        $delCacheList = array();
         foreach($cartList as $cart){
             if($cart['type']==\Our\ApiConst::addBundingToCart){
                 continue;
             }
+            $delCacheList[] = $cart;
             $fav = array();
             $fav['member_id'] = $memberId;
             if($cart['type'] == \Our\ApiConst::addGoodsToCart){
@@ -536,7 +538,7 @@ class CartServiceModel extends \Business\AbstractModel{
         }
         $cartIds = explode(',',$where['cartIds']);
         $cartIds = array_filter($cartIds);
-        $sql = \Our\Common::format(' cart_id in({0}) and buyer_id={1}',implode(',',$cartIds),$memberId);
+        $sql = \Our\Common::format(' cart_id in({0}) and buyer_id={1} and type =1 ',implode(',',$cartIds),$memberId);
         $result = $cartDao->del($sql);
         if(!$result){
             $cartDao->db->doRollback();
@@ -546,7 +548,7 @@ class CartServiceModel extends \Business\AbstractModel{
         $cartRedis = \Redis\Db7\CartRedisModel::getInstance();
         $cartRedis->tableDel($memberCartKey);
         $FavoritesInstance = \DAO\FavoritesModel::getInstance();
-        foreach($cartList as $cart){
+        foreach($delCacheList as $cart){
             $memberStoreCartsKey = \Our\NameConst::memberStoreCartsPrefix.$memberId.\Our\NameConst::underline.$cart['store_id'];
             $cartRedis->tableDel($memberStoreCartsKey);
             \Our\RedisHelper::delCachedFunction(\Redis\Db4\FavoritesRedisModel::getInstance(),array(&$FavoritesInstance, 'getOne'),array('*',array('member_id'=>$memberId,'goods_commonid'=>$cart['goods_commonid'])),array($memberId));