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

application/controllers/Cart.php

@@ -44,7 +44,7 @@ class CartController extends \Our\Controller_AbstractApi{
         //获取购物车为空时的广告位
         $advService = \Business\Common\AdvServiceModel::getInstance();
         $emptyCartAdvs = $advService->getEmptyCartAdvs();
-        $cartList['advs'] = $emptyCartAdvs;
+        $cartList['advs'] = $emptyCartAdvs?$emptyCartAdvs:array();
 
         $this->success($cartList);
     }

application/library/Our/SmsTemplateConst.php

@@ -76,10 +76,9 @@ class SmsTemplateConst{
         ),
         //尊敬的${storename}，您的店铺由于${reason}无法通过审核，请登录商户后台查看。
         'storeCheckUnpass'=>  array(
-            'templateId'=>'SMS_151547302',
+            'templateId'=>'SMS_154495028',
             'parameters'=>array(
-                'storename',
-                'reason'
+                'storename'
             )
         ),
         //目前共有${storeCount}家商户注册待审核，${weiCount}家微信支付待处理状态（需结合微信服务商状态）。