Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/web-list

@@ -2,7 +2,7 @@
 namespace LibModels\Web\Home;
 namespace LibModels\Web\Home;
 use Api\Yohobuy;
 use Api\Yohobuy;
 use Api\Sign;
 use Api\Sign;
-use Plugin\Helpers;
+use WebPlugin\Helpers;
 class UserData extends \LibModels\Wap\Home\UserData
 class UserData extends \LibModels\Wap\Home\UserData
 {
 {
     /**
     /**

+<?php
+namespace LibModels\Web\Product;
+
+use Api\Yohobuy;
+/**
+ * FavoriteData
+ * 收藏相关接口
+ * @author Administrator
+ */
+class FavoriteData {
+    
+    const URL_PRODUCT_FAVORITE = 'shops/service/v1/favorite/';
+    
+    /**
+     * 根据uid和商品的skn查询是否被用户收藏
+     * @param $uid
+     * @param $productSkn
+     * @return boolean 收藏 true 未收藏 false
+     */
+    public static function getUidProductFav($uid, $productSkn)
+    {
+        return Yohobuy::yarClient(Yohobuy::SERVICE_URL . self::URL_PRODUCT_FAVORITE, 'getUidProductFav', array($uid, $productSkn));
+    }
+    
+    /**
+     * 根据uid和商品的skn收藏商品
+     * @param $uid
+     * @param $productSkn
+     * @return bool
+     */
+    public static function addUidProductFav($uid, $productSkn)
+    {
+        return Yohobuy::yarClient(Yohobuy::SERVICE_URL . self::URL_PRODUCT_FAVORITE, 'addUidProductFav', array($uid, $productSkn));
+    }
+    
+    /**
+     * 根据uid和商品的skn取消收藏商品
+     * @param $uid
+     * @param $productSkn
+     * @return bool
+     */
+    public static function delUidProductFav($uid, $productSkn)
+    {
+        return Yohobuy::yarClient(Yohobuy::SERVICE_URL . self::URL_PRODUCT_FAVORITE, 'delUidProductFav', array($uid, $productSkn));
+    }
+    
+}

@@ -71,7 +71,7 @@ class Bootstrap extends Bootstrap_Abstract
         $controller = 'Index';
         $controller = 'Index';
         $action = 'Index';
         $action = 'Index';
         // 二级域名
         // 二级域名
-        if (2 === $level) {
+        if (3 === $level) {
             $url = strtolower($dispatcher->getRequest()->getRequestUri());
             $url = strtolower($dispatcher->getRequest()->getRequestUri());
             if(empty($url) || $url == '/index' || $url == '/') {
             if(empty($url) || $url == '/index' || $url == '/') {
                 $urlAction = '/index';
                 $urlAction = '/index';

 <?php
 <?php
 use Action\WebAction;
 use Action\WebAction;
 use Index\HomeModel;
 use Index\HomeModel;
-use WebPlugin\Captcha;
 /**
 /**
  * 女首
  * 女首
  */
  */

@@ -221,6 +221,7 @@ class SearchModel
             //组织数据结构
             //组织数据结构
             $data = HelperSearch::getProductPic($data['data']['product_list'], $options);
             $data = HelperSearch::getProductPic($data['data']['product_list'], $options);
         }
         }
+        $data['isFavorite'] = $options['isFavorite'];
         echo json_encode($data);
         echo json_encode($data);
     }
     }
 
 

 <?php
 <?php
 use Action\WebAction;
 use Action\WebAction;
 use Product\SearchModel;
 use Product\SearchModel;
+use LibModels\Web\Product\FavoriteData;
+
 class ListController extends WebAction
 class ListController extends WebAction
 {
 {
     public function indexAction()
     public function indexAction()
@@ -12,6 +14,7 @@ class ListController extends WebAction
             'positionId' => $positionId,
             'positionId' => $positionId,
             'reviewNum' => 6
             'reviewNum' => 6
         );
         );
+        
         $indexData = Product\IndexModel::getIndexData($condition, $options);
         $indexData = Product\IndexModel::getIndexData($condition, $options);
         
         
         $data = array(
         $data = array(
@@ -31,8 +34,6 @@ class ListController extends WebAction
             'order' => 's_t_desc'
             'order' => 's_t_desc'
         );
         );
         $options = array(
         $options = array(
-            'specialsale_id' => 'Y',
-            'needDay' => 'Y',
             'reviewNum' => 6
             'reviewNum' => 6
         );
         );
         
         
@@ -69,7 +70,12 @@ class ListController extends WebAction
      */
      */
     public function getProductPicAction()
     public function getProductPicAction()
     {
     {
+        if (!$this->isAjax()) {
+            return;
+        }
         $product_skn = $this->post('skn');
         $product_skn = $this->post('skn');
+        $uid = $this->getUid();
+        
         if (!$product_skn) {
         if (!$product_skn) {
             return ;
             return ;
         }
         }
@@ -90,6 +96,46 @@ class ListController extends WebAction
             'imgSize' => $imgSize,
             'imgSize' => $imgSize,
             'minImgSize' => $minImgSize,
             'minImgSize' => $minImgSize,
         );
         );
+        
+        $isFavorite = false;
+        if ($uid) {
+            $favorite = FavoriteData::getUidProductFav($uid, $product_skn);
+            if (isset($favorite['code']) && $favorite['code'] == 200) {
+                $isFavorite = true;
+            }
+        }
+        $options['isFavorite'] = $isFavorite;
         SearchModel::getProductPic($product_skn, $options);
         SearchModel::getProductPic($product_skn, $options);
     }
     }
+    
+    /**
+     * 根据product_skn收藏
+     * @author 
+     * @return json
+     */
+    public static function changeFavoriteAction()
+    {
+        if (!$this->isAjax()) {
+            return;
+        }
+        $product_skn = $this->post('skn');
+        $isFavorite = $this->post('isFavorite');
+        $uid = $this->getUid();
+        
+        do {
+            if (!$product_skn && !$uid) {
+                break;
+            }
+            if ($isFavorite) {
+                $result = FavoriteData::delUidProductFav($uid, $product_skn);
+                $this->echoJson($result);
+                break;
+            }else{
+                $result = FavoriteData::addUidProductFav($uid, $product_skn);
+                $this->echoJson($result);
+                break;
+            }
+        } while(false);
+    
+    }
 }
 }