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

application/models/Business/Order/OrderService.php

@@ -317,7 +317,7 @@ class OrderServiceModel extends \Business\AbstractModel
                     }
                 }
                 if ($memberId) {
-                    $orderDao->deleteOrderCache($memberId, $orderId, $order['store_id'],true);
+                    $orderDao->deleteOrderCache($memberId, $orderId, $order['storeId'],true);
                     // $memberDao->fromOrderStateToOrderState($memberId,$order['order_state'],ApiConst::orderStateCancel);
                 }
             }

application/models/Business/Store/ShopkeeperService.php

@@ -54,7 +54,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
         $orderDao=\DAO\Order\OrderModel::getInstance();
         $favoritesStoreDao=\DAO\FavoritesStoreModel::getInstance();
         $orderGoodsDao=\DAO\Order\OrderGoodsModel::getInstance();
-        $goodsCount=\Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$orderGoodsDao, 'getOrderGoodsCountByStoreId'), array($storeId), ApiConst::one, array($storeId));
+        $goodsCount=\Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$orderGoodsDao, 'getOrderGoodsCountByStoreId'), array($storeId), ApiConst::tenDaySecond, array($storeId));
         $condition['store_id'] = $storeId;
         //获取店铺信息
         $store = \Our\RedisHelper::cachedFunction(\Redis\Db6\StoreRedisModel::getInstance(), array(&$this->storeDao, 'getInfo'), array($condition), ApiConst::tenDaySecond, array($storeId));

application/models/DAO/Order/OrderGoods.php

@@ -54,6 +54,7 @@ class OrderGoodsModel extends \DAO\AbstractModel {
      */
     public function update($where, $data){
         $this->setDb(DbNameConst::masterDBConnectName);
+        $data['gmt_update']=TIMESTAMP;
         return $this->db->update($this->_tableName)->where($where)->rows($data)->execute();
     }