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

application/models/Business/Order/OrderService.php

@@ -191,7 +191,7 @@ class OrderServiceModel extends \Business\AbstractModel
 //        }
         //定单商品表
 
-        $this->orderGoodsList = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderGoodsDao, 'getOrderGoodsByOrderIds'), array($orderId, $this->getGoodsDetailField()), \Our\ApiConst::oneDaySecond);
+        $this->orderGoodsList = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderGoodsDao, 'getOrderGoodsByOrderIds'), array($orderId, $this->getGoodsDetailField()), \Our\ApiConst::oneDaySecond,array($orderId));
         //商店相关信息
         $this->store = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$storeDao, 'getInfoById'), array($this->order['storeId'], $this->storeField), \Our\ApiConst::oneDaySecond);
         $returnData = $this->order;

application/models/DAO/Order/Order.php

@@ -709,7 +709,7 @@ class OrderModel extends \DAO\AbstractModel
         if(!empty($orderId)){
             $this->deleteFindByOrderIdCache($orderId);
             $orderGoodsDao=\DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
-            $orderGoodsDao->deleteOrderGoodsCache($orderId);
+            $orderGoodsDao->deleteOrderGoodsCache($memberId,$orderId);
         }
 
     }

application/models/DAO/Order/OrderGoods.php

@@ -100,8 +100,13 @@ class OrderGoodsModel extends \DAO\AbstractModel {
         return $this->getOrderGoods($where,$field);
     }
 
-    public function deleteOrderGoodsCache($orderIds){
-        return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getOrderGoodsByOrderIds'), array($orderIds));
+    public function deleteOrderGoodsCache($memberId,$orderIds){
+        if($memberId){
+            return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getOrderGoodsByOrderIds'), array($memberId));
+        }
+        if($orderIds){
+            return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getOrderGoodsByOrderIds'), array($orderIds));
+        }
     }
     public function getIsRefundMoney($orderGoodses,$promotionsId){
         $isRefundMoney=ApiConst::zero;