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

application/library/Our/AdvConst.php

@@ -16,7 +16,7 @@ class AdvConst {
 
     const advPositionHomeMiddle =  1052; //首页中部广告位
 
-    const advPositionPopUp = 1050; //平台首页弹窗广告
+    const advPositionPopUp = 1048; //平台首页弹窗广告
 
     const advIntervalSecond = 2000; //广告位默认轮播时间间隔,单位毫秒
 

application/models/Business/Common/AdvService.php

@@ -71,6 +71,9 @@ class AdvServiceModel extends \Business\AbstractModel{
         $advInstance = \DAO\Adv\AdvModel::getInstance();
 
         $advs = \Our\RedisHelper::cachedFunction(\Redis\Db9\AdvRedisModel::getInstance(),array(&$advInstance, 'getPostionAdv'),array(\Our\AdvConst::advPositionHomeTop),\Our\ApiConst::oneHour,array(\Our\AdvConst::advPositionHomeTop));
+        if(!$advs){
+            $advs = array();
+        }
         return $advs;
     }
 
@@ -82,6 +85,9 @@ class AdvServiceModel extends \Business\AbstractModel{
         $advInstance = \DAO\Adv\AdvModel::getInstance();
         $advInstance->getPostionAdv(\Our\AdvConst::advPositionHomeMiddle);
         $advs = \Our\RedisHelper::cachedFunction(\Redis\Db9\AdvRedisModel::getInstance(),array(&$advInstance, 'getPostionAdv'),array(\Our\AdvConst::advPositionHomeMiddle),\Our\ApiConst::oneHour,array(\Our\AdvConst::advPositionHomeMiddle));
+        if(!$advs){
+            $advs = array();
+        }
         return $advs;
     }
 
@@ -104,10 +110,7 @@ class AdvServiceModel extends \Business\AbstractModel{
                 $return['intervalTime'] = \Our\AdvConst::advIntervalSecond;
             }
         }
-        if($return){
-            return $return;
-        }
-        return false;
+        return $return;
     }
 
     public function getStoreCover($where){