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

application/models/Business/Goods/EvaluationService.php

@@ -24,7 +24,7 @@ class EvaluationServiceModel extends \Business\AbstractModel {
         if($order['diliveryman_id']) {
             //获取配送员评价标签
             $evalLabelDAO = \DAO\DeliveryEvalLabelModel::getInstance();
-            $data = \Our\RedisHelper::cachedFunction(\Redis\Db5\DeliveryEvalLabelRedisModel::getInstance(),array(&$evalLabelDAO, 'getLabelList'),array(array('store_id'=>$order['store_id'],'is_show'=>1),'label_id,label_name'),\Our\ApiConst::oneDaySecond);
+            $data = \Our\RedisHelper::cachedFunction(\Redis\Db5\DeliveryEvalLabelRedisModel::getInstance(),array(&$evalLabelDAO, 'getLabelList'),array(array('store_id'=>$order['store_id'],'is_show'=>1),'label_id,label_name'),\Our\ApiConst::oneDaySecond,array($order['store_id']));
             if($data && is_array($data)){
                 foreach ($data as $k=>$v){
                     $serviceEvaluations[] = array('labelId'=>$v['label_id'],'label'=>$v['label_name']);

application/models/Redis/Db5/DeliveryEvalLabelRedis.php

@@ -10,7 +10,7 @@ class DeliveryEvalLabelRedisModel extends \Redis\Db5\AbstractModel {
      *
      * @var string
      */
-    protected $_tableName = 'OrderRedis.php';
+    protected $_tableName = 'han_delivery_eval_label';
    
 
     /**