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

application/controllers/Store.php

@@ -113,7 +113,6 @@ class StoreController extends \Our\Controller_AbstractIndex {
         $data = $this->req[\Our\NameConst::data];
         $couponService = \Business\Coupon\CouponServiceModel::getInstance();
         $couponTitles = $couponService->getStorePromotionCouponTitles($data);
-		$couponTitles=!empty($couponTitles)?$couponTitles:array();
 		$this->success($couponTitles);
     }
 

application/models/Business/Coupon/CouponService.php

@@ -269,7 +269,7 @@ class CouponServiceModel extends \Business\AbstractModel{
         $this->validCouponStore($where);
         $couponDao = \DAO\Coupon\CouponModel::getInstance();
         $couponTitles = \Our\RedisHelper::cachedFunction(\Redis\Db13\CouponRedisModel::getInstance(), array(&$couponDao, 'getStorePromotionCouponList'),array($where['storeId']),\Our\ApiConst::oneHour,array($where['storeId']));
-        return $couponTitles;
+        return $couponTitles?$couponTitles:array();
     }
 
     /**
@@ -281,6 +281,8 @@ class CouponServiceModel extends \Business\AbstractModel{
         $couponList = \Our\RedisHelper::cachedFunction(\Redis\Db13\CouponRedisModel::getInstance(), array(&$this, 'getStoreCouponsById'),array($where['storeId'],$memberId),\Our\ApiConst::oneHour,array($where['storeId']."_".$memberId));
         if($couponList){
             $couponList = array_values($couponList);
+        }else{
+            $couponList = array();
         }
         return $couponList;
     }