Changeset 22582 for branches/version-2_12-dev

Timestamp:

2013/02/26 09:09:44 (11 years ago)

Author:

pineray

Message:

#2162 pageクラスからdtb_best_productsテーブルを直接指定している箇所をなくす

Location:

branches/version-2_12-dev/data

Files:

• Smarty/templates/admin/contents/recommend.tpl (modified) (5 diffs)
• class/helper/SC_Helper_Recommend.php (added)
• class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php (modified) (9 diffs)
• class/pages/admin/products/LC_Page_Admin_Products.php (modified) (2 diffs)
• class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php (modified) (1 diff)
• class_extends/helper_extends/SC_Helper_Recommend_Ex.php (added)

branches/version-2_12-dev/data/Smarty/templates/admin/contents/recommend.tpl

@@ -21 +21 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
-*}-->
+
+ *}-->
 
 <script type="text/javascript">
@@ -75 +76 @@
     if ( flag ){
         document.form1["mode"].value = mode;
-        document.form1["rank"].value = data;
+        document.form1["best_id"].value = data;
         document.form1.submit();
     }
@@ -117 +118 @@
                                             <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
                                             <input type="hidden" name="mode" value="regist" />
+                                            <input type="hidden" name="best_id" value="<!--{$arrItems[$smarty.section.cnt.iteration].best_id|h}-->" />
                                             <input type="hidden" name="product_id" value="<!--{$arrItems[$smarty.section.cnt.iteration].product_id|h}-->" />
                                             <input type="hidden" name="category_id" value="<!--{$category_id|h}-->" />
@@ -133 +135 @@
                                 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
                                 <input type="hidden" name="mode" value="regist" />
+                                <input type="hidden" name="best_id" value="<!--{$arrItems[$smarty.section.cnt.iteration].best_id|h}-->" />
                                 <input type="hidden" name="product_id" value="<!--{$arrItems[$smarty.section.cnt.iteration].product_id|h}-->" />
                                 <input type="hidden" name="category_id" value="<!--{$category_id|h}-->" />
@@ -158 +161 @@
                     <!--{* 移動 *}-->
                     <!--{if $smarty.section.cnt.iteration != 1 && $arrItems[$smarty.section.cnt.iteration].product_id}-->
-                        <a href="?" onclick="lfnSortItem('up',<!--{$arrItems[$smarty.section.cnt.iteration].rank}-->); return false;">上へ</a><br />&nbsp;
+                        <a href="?" onclick="lfnSortItem('up',<!--{$arrItems[$smarty.section.cnt.iteration].best_id}-->); return false;">上へ</a><br />&nbsp;
                     <!--{/if}-->
                     <!--{if $smarty.section.cnt.iteration != $tpl_disp_max && $arrItems[$smarty.section.cnt.iteration].product_id}-->
-                        <a href="?" onclick="lfnSortItem('down',<!--{$arrItems[$smarty.section.cnt.iteration].rank}-->); return false;">下へ</a>
+                        <a href="?" onclick="lfnSortItem('down',<!--{$arrItems[$smarty.section.cnt.iteration].best_id}-->); return false;">下へ</a>
                     <!--{/if}-->
                 </td>

branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php

@@ -77 +77 @@
         $objFormParam->setParam($_POST);
         $objFormParam->convParam();
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $objDb = new SC_Helper_DB_Ex();
+        $arrPost = $objFormParam->getHashArray();
+
+        $objRecommend = new SC_Helper_Recommend_Ex();
 
         switch ($this->getMode()) {
-            case 'down': //商品の並び替えをする。おすすめはデータベースの登録が昇順なので、Modeを逆にする。
-                $arrRet = $objQuery->select('best_id', 'dtb_best_products', 'rank = ?', array($_POST['rank'])); //おすすめidの取得
-                $best_id = $arrRet[0]['best_id'];
-                $objDb->sfRankUp('dtb_best_products','best_id',$best_id);
-                $arrPost = $objFormParam->getHashArray();
-                $arrItems = $this->getRecommendProducts();
-                break;
-
-            case 'up': //商品の並び替えをする。おすすめのみデータベースの登録が昇順なので、Modeを逆にする。
-                $arrRet = $objQuery->select('best_id', 'dtb_best_products', 'rank = ?', array($_POST['rank'])); //おすすめidの取得
-                $best_id = $arrRet[0]['best_id'];
-                $objDb->sfRankDown('dtb_best_products','best_id',$best_id);
-                $arrPost = $objFormParam->getHashArray();
-                $arrItems = $this->getRecommendProducts();
+            case 'down': //商品の並び替えをする。
+                $objRecommend->rankDown($arrPost['best_id']);
+                $arrItems = $this->getRecommendProducts($objRecommend);
+                break;
+
+            case 'up': //商品の並び替えをする。
+                $objRecommend->rankUp($arrPost['best_id']);
+                $arrItems = $this->getRecommendProducts($objRecommend);
                 break;
 
             case 'regist': // 商品を登録する。
                 $this->arrErr = $this->lfCheckError($objFormParam);
-                $arrPost = $objFormParam->getHashArray();
                 // 登録処理にエラーがあった場合は商品選択の時と同じ処理を行う。
                 if (SC_Utils_Ex::isBlank($this->arrErr)) {
                     $member_id = $_SESSION['member_id'];
-                    $this->insertRecommendProduct($arrPost,$member_id);
-                    $arrItems = $this->getRecommendProducts();
+                    $this->insertRecommendProduct($arrPost,$member_id,$objRecommend);
+                    $arrItems = $this->getRecommendProducts($objRecommend);
                 } else {
                     $arrItems = $this->setProducts($arrPost, $arrItems);
@@ -113 +107 @@
             case 'delete': // 商品を削除する。
                 $this->arrErr = $this->lfCheckError($objFormParam);
-                $arrPost = $objFormParam->getHashArray();
                 if (SC_Utils_Ex::isBlank($this->arrErr)) {
-                    $this->deleteProduct($arrPost);
-                    $arrItems = $this->getRecommendProducts();
+                    $this->deleteProduct($arrPost, $objRecommend);
+                    $arrItems = $this->getRecommendProducts($objRecommend);
                 }
                 $this->tpl_onload = "window.alert('削除しました');";
@@ -124 +117 @@
                 $arrPost = $objFormParam->getHashArray();
                 if (SC_Utils_Ex::isBlank($this->arrErr['rank']) && SC_Utils_Ex::isBlank($this->arrErr['product_id'])) {
-                    $arrItems = $this->setProducts($arrPost, $this->getRecommendProducts());
+                    $arrItems = $this->setProducts($arrPost, $this->getRecommendProducts($objRecommend));
                     $this->checkRank = $arrPost['rank'];
                 }
                 break;
             default:
-                $arrItems = $this->getRecommendProducts();
+                $arrItems = $this->getRecommendProducts($objRecommend);
                 break;
         }
@@ -158 +151 @@
     function lfInitParam(&$objFormParam)
     {
+        $objFormParam->addParam('おすすめ商品ID', 'best_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('商品ID', 'product_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
         $objFormParam->addParam('カテゴリID', 'category_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
@@ -178 +172 @@
     /**
      * 既に登録されている内容を取得する
+     * @param Object $objRecommend
      * @return Array $arrReturnProducts データベースに登録されているおすすめ商品の配列
      */
-    function getRecommendProducts()
-    {
+    function getRecommendProducts(SC_Helper_Recommend_Ex &$objRecommend)
+    {
+        $arrList = $objRecommend->getList();
+        // product_id の一覧を作成
+        $product_ids = array();
+        foreach ($arrList as $value) {
+            $product_ids[] = $value['product_id'];
+        }
+
+        $objProduct = new SC_Product_Ex;
         $objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = 'dtb_products.name,dtb_products.main_list_image,dtb_best_products.*,dtb_products.status';
-        $table = 'dtb_best_products INNER JOIN dtb_products ON dtb_best_products.product_id = dtb_products.product_id';
-        $where = 'dtb_best_products.del_flg = 0';
-        $order = 'rank';
-        $objQuery->setOrder($order);
-        $arrProducts = $objQuery->select($col, $table, $where);
+        $arrProducts = $objProduct->getListByProductIds($objQuery, $product_ids);
 
         $arrReturnProducts = array();
-        foreach ($arrProducts as $data) {
+        foreach ($arrList as $data) {
+            $data['main_list_image'] = $arrProducts[$data['product_id']]['main_list_image'];
+            $data['name'] = $arrProducts[$data['product_id']]['name'];
             $arrReturnProducts[$data['rank']] = $data;
         }
@@ -201 +201 @@
      * @param Array $arrPost POSTの値を格納した配列
      * @param Integer $member_id 登録した管理者を示すID
-     */
-    function insertRecommendProduct($arrPost,$member_id)
-    {
-        $objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
+     * @param Object $objRecommend
+     */
+    function insertRecommendProduct($arrPost,$member_id, SC_Helper_Recommend_Ex &$objRecommend)
+    {
         // 古いおすすめ商品のデータを削除する。
-        $this->deleteProduct($arrPost);
+        $this->deleteProduct($arrPost, $objRecommend);
 
         $sqlval = array();
@@ -214 +214 @@
         $sqlval['comment'] = $arrPost['comment'];
         $sqlval['creator_id'] = $member_id;
-        $sqlval['create_date'] = 'CURRENT_TIMESTAMP';
-        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
-        $sqlval['best_id'] = $objQuery->nextVal('dtb_best_products_best_id');
-        $objQuery->insert('dtb_best_products', $sqlval);
+        $objRecommend->save($sqlval);
     }
 
@@ -223 +220 @@
      * データを削除する
      * @param Array $arrPost POSTの値を格納した配列
-     */
-    function deleteProduct($arrPost)
-    {
-        $objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $table = 'dtb_best_products';
-        $where = 'category_id = ? AND rank = ?';
-        $arrWhereVal = array($arrPost['category_id'],$arrPost['rank']);
-        $objQuery->delete($table, $where, $arrWhereVal);
+     * @param Object $objRecommend
+     * @return void
+     */
+    function deleteProduct($arrPost, SC_Helper_Recommend_Ex &$objRecommend)
+    {
+        if ($arrPost['best_id']) {
+            $target = $arrPost['best_id'];
+        } else {
+            $recommend = $objRecommend->getByRank($arrPost['rank']);
+            $target = $recommend['best_id'];
+        }
+        $objRecommend->delete($target);
     }
 
@@ -236 +237 @@
      * 商品情報を取得する
      * @param Integer $product_id 商品ID
-     * @return Array $arrProduct 商品のデータを格納した配列
+     * @return Array $return 商品のデータを格納した配列
      */
     function getProduct($product_id)
     {
-        $objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $col = 'product_id,main_list_image,name';
-        $table = 'dtb_products';
-        $where = 'product_id = ? AND del_flg = 0';
-        $arrWhereVal = array($product_id);
-        $arrProduct = $objQuery->select($col, $table, $where, $arrWhereVal);
-        return $arrProduct[0];
+        $objProduct = new SC_Product_Ex();
+        $arrProduct = $objProduct->getDetail($product_id);
+        $return = array(
+            'product_id' => $arrProduct['product_id'],
+            'main_list_image' => $arrProduct['main_list_image'],
+            'name' => $arrProduct['name']
+        );
+        return $return;
     }
 

branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php

@@ -266 +266 @@
     {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
+        $arrRet = $objQuery->getCol('product_id', "dtb_products", $where, $arrParam);
+        $product_ids = array();
+        foreach ($arrRet as $value) {
+            $product_ids[] = $value['product_id'];
+        }
         $sqlval['del_flg']     = 1;
         $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
@@ -271 +276 @@
         $objQuery->update('dtb_products_class', $sqlval, "product_id IN (SELECT product_id FROM dtb_products WHERE $where)", $arrParam);
         $objQuery->delete('dtb_customer_favorite_products', "product_id IN (SELECT product_id FROM dtb_products WHERE $where)", $arrParam);
-        $objQuery->delete('dtb_best_products', "product_id IN (SELECT product_id FROM dtb_products WHERE $where)", $arrParam);
+
+        $objRecomment = new SC_Helper_Recommend_Ex();
+        $objRecomment->deleteByProductIDs($product_ids);
+
         $objQuery->update('dtb_products', $sqlval, $where, $arrParam);
         $objQuery->commit();

branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php

@@ -94 +94 @@
     function lfGetRanking()
     {
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $objProduct = new SC_Product_Ex();
+        $objRecommend = new SC_Helper_Recommend_Ex();
 
         // おすすめ商品取得
-        $col = 'T1.best_id, T1.category_id, T1.rank, T1.product_id, T1.title, T1.comment, T1.create_date, T1.update_date';
-        $table = 'dtb_best_products as T1 INNER JOIN dtb_products as T2 ON T1.product_id = T2.product_id';
-        $where = 'T1.del_flg = 0 and T2.status = 1';
-        if (NOSTOCK_HIDDEN) {
-            $where .= ' AND EXISTS(SELECT * FROM dtb_products_class WHERE product_id = T1.product_id AND dtb_products_class.del_flg = 0 AND (stock >= 1 OR stock_unlimited = 1))';
-        }
-        $objQuery->setOrder('T1.rank');
-        $objQuery->setLimit(RECOMMEND_NUM);
-        $arrBestProducts = $objQuery->select($col, $table, $where);
+        $arrRecommends = $objRecommend->getList(RECOMMEND_NUM);
 
-        $objQuery =& SC_Query_Ex::getSingletonInstance();
-        if (count($arrBestProducts) > 0) {
+        $response = array();
+        if (count($arrRecommends) > 0) {
             // 商品一覧を取得
+            $objQuery =& SC_Query_Ex::getSingletonInstance();
+            $objProduct = new SC_Product_Ex();
             // where条件生成&セット
             $arrProductId = array();
-            $where = 'product_id IN (';
-            foreach ($arrBestProducts as $key => $val) {
+            foreach ($arrRecommends as $key => $val) {
                 $arrProductId[] = $val['product_id'];
             }
-            // 取得
-            $arrProductList = $objProduct->getListByProductIds($objQuery, $arrProductId);
+            $arrProducts = $objProduct->getListByProductIds($objQuery, $arrProductId);
+
+            // 税込金額を設定する
+            SC_Product_Ex::setIncTaxToProducts($arrProducts);
+
             // おすすめ商品情報にマージ
-            foreach ($arrBestProducts as $key => $value) {
-                $arrRow =& $arrBestProducts[$key];
-                if (isset($arrProductList[$arrRow['product_id']])) {
-                    $arrRow = array_merge($arrRow, $arrProductList[$arrRow['product_id']]);
+            foreach ($arrRecommends as $key => $value) {
+                if (isset($arrProducts[$value['product_id']])) {
+                    $product = $arrProducts[$value['product_id']];
+                    if (!NOSTOCK_HIDDEN || ($product['status'] == 1 && ($product['stock_max'] >= 1 || $product['stock_unlimited_max'] == 1))) {
+                        $response[] = array_merge($value, $arrProducts[$value['product_id']]);
+                    }
                 } else {
                     // 削除済み商品は除外
-                    unset($arrBestProducts[$key]);
+                    unset($arrRecommends[$key]);
                 }
             }
         }
-        return $arrBestProducts;
+        return $response;
     }
 }