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

application/models/Business/Order/RefundService.php

@@ -1001,10 +1001,10 @@ class RefundServiceModel extends \Business\AbstractModel
         // $shippingTypes = ArrayConst::refundShippingType[$orderInfo['shippingType']];
         //获得订单商品
         $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance();
-        $orderGoodses = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderGoodsDao, 'getOrderGoodsByOrderIds'), array($orderInfo['orderId'], $this->orderGoodsField), \Our\ApiConst::oneDaySecond);
+        $orderGoodses =$orderGoodsDao->getOrderGoodsByOrderIds($orderInfo['orderId'], $this->orderGoodsField);
+        //\Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderGoodsDao, 'getOrderGoodsByOrderIds'), array($orderInfo['orderId'], $this->orderGoodsField), \Our\ApiConst::oneDaySecond);
         $orderGoodses = $orderGoodsDao->convertOrderGoods($orderGoodses, 'goodsId');
         $allOrderGoods=$orderGoodses;
-
         $goodsIds = $orderGoodsDao->getRefundOrderGoodsIds($orderGoodses);
         $alreadyRefundGoodsIds=$goodsIds;
 //        $this->store=$storeDao->get($this->order['storeId']);