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

application/library/Order/OrderConfirmUtil.php

@@ -806,7 +806,9 @@ class OrderConfirmUtil {
         $goodsIds = array();
         $blIds = array();
         $goodsNewList = array();
+        $pbundlingInstance = \DAO\PBundlingModel::getInstance();
         foreach($storeCartsList as $storeId=>$storeCarts){
+            $blUpdateFlag = false;
             foreach($storeCarts['storeCarts'] as $storeCart){
                 if($storeCart['type']==\Our\ApiConst::addGoodsToCart){
                     if(isset($goodsCommonIds[$storeCart['goodsCommonId']]['goodsCommonId'])){
@@ -827,6 +829,7 @@ class OrderConfirmUtil {
                     $blIds[$storeCart['goodsId']]['blId'] = $storeCart['goodsId'];
                     $blIds[$storeCart['goodsId']]['blStorage'] = $storeCart['goodsNum'];
                     $goodsList = $storeCart['goodsList'];
+                    $blUpdateFlag = true;
                     foreach ($goodsList as $item) {
                         //$goodsCommonIds[] = $item['goodsCommonId'];
                         //$goodsIds[$storeCart['goodsCommonId']][] = $item['goodsId'];
@@ -844,6 +847,7 @@ class OrderConfirmUtil {
                         }
                         $goodsNewList[$item['goodsId']] = $goodsIds[$item['goodsCommonId']][$item['goodsId']];
                     }
+                    \Our\RedisHelper::delCachedFunction(\Redis\Db4\PBundlingRedisModel::getInstance(),array(&$pbundlingInstance, 'getList'),array(),array('*'.$storeCart['goodsId'].'*'));
                 }
             }
             if($updateSaleNumFlag){
@@ -855,6 +859,9 @@ class OrderConfirmUtil {
             $cartRedis = \Redis\Db7\CartRedisModel::getInstance();
             $memberCartKey = \Our\NameConst::memberStoreCartsPrefix.'*_'.$storeId;
             $cartRedis->tableDelAll($cartRedis->tableKeys($memberCartKey));
+            if($blUpdateFlag){
+                \Our\RedisHelper::delCachedFunction(\Redis\Db4\PBundlingRedisModel::getInstance(),array(&$pbundlingInstance, 'getList'),array(),array($storeId));
+            }
         }
         $this->updateGoodsStorageToDBAndCache($goodsCommonIds,$goodsIds,$blIds,$goodsNewList,$op,$updateSaleNumFlag);
         return true;