Merge branch 'feature/coupon' of http://git.dev.yoho.cn/web/yohobuy into feature/coupon

@@ -24,7 +24,7 @@ class CouponController extends AbstractAction
      */
      */
     public function floorAction()
     public function floorAction()
     {
     {
-        $data = [
+        $result = [
             'title' => '热门推荐',
             'title' => '热门推荐',
             'showTitle' => 1,
             'showTitle' => 1,
             'coupons' => [
             'coupons' => [
@@ -60,9 +60,12 @@ class CouponController extends AbstractAction
                 ]
                 ]
             ]
             ]
         ];
         ];
+        /*// 优惠券列表接口调用
+        $param['method'] = 'app.promotion.queryCoupon';
+        $result = \Api\YohobuyH5::get(\Api\YohobuyH5::SERVICE_URL,$param);*/
 
 
         $this->_view->display('index', array(
         $this->_view->display('index', array(
-            'floor' => $data,
+            'floor' => $result,
             'floorPage' => true
             'floorPage' => true
         ));
         ));
     }
     }
@@ -107,19 +110,46 @@ class CouponController extends AbstractAction
     public function getCoupon($couponId)
     public function getCoupon($couponId)
     {
     {
         if ($couponId) {
         if ($couponId) {
-            $param['alg'] = 'SALT_MD5';
-            $param['code'] = 200;
-            $param['data'] = '';
-            $param['md5'] = '50d19f5f5098c34607018f144baec14a';
-            $param['message'] = '操作成功';
+            $result['alg'] = 'SALT_MD5';
+            $result['code'] = 200;
+            $result['data'] = '';
+            $result['md5'] = '50d19f5f5098c34607018f144baec14a';
+            $result['message'] = '操作成功';
         } else {
         } else {
-            $param['alg'] = 'SALT_MD5';
-            $param['code'] = 402;
-            $param['data'] = '';
-            $param['md5'] = '50d19f5f5098c34607018f144baec14a';
-            $param['message'] = '操作失败';
+            $result['alg'] = 'SALT_MD5';
+            $result['code'] = 402;
+            $result['data'] = '';
+            $result['md5'] = '50d19f5f5098c34607018f144baec14a';
+            $result['message'] = '操作失败';
         }
         }
-        return $param;
+
+        /*// 判断用户是否登录
+        if (!$this->getUid() || !is_numeric($this->getUid())) {
+            // 用户未登录，跳转登录页面
+            if ($this->isApp()) {
+                $this->go(Helpers::url('/signin.html', array('refer' => Helpers::url($_SERVER["REQUEST_URI"])), 'default'));
+            } else {
+                $this->go($_SERVER["REQUEST_URI"] . '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . strtr($_SERVER["REQUEST_URI"], array('/' => '\\/')) . '","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}');
+            }
+        }
+
+        // 组合接口参数
+        $params['method'] = 'app.promotion.getCoupon';
+        $params['couponId'] = $couponId;
+        $params['uid'] = $this->getUid();
+
+        $result = \Api\YohobuyH5::get(\Api\YohobuyH5::SERVICE_URL, $params);*/
+
+        return $result;
     }
     }
 
 
+    /**
+     * 判断是否是 APP
+     *
+     * @return bool
+     */
+    public function isApp()
+    {
+        return (null !== $this->get('app_version'));
+    }
 }
 }