Changeset 23518 for branches/version-2_13-dev/data

Timestamp:

2014/06/04 00:11:08 (12 years ago)

Author:

shutta

Message:

#2569 ダウンロード販売商品のダウンロード時にタイムアウト
DB件数に比例して、lfGetRealFileNameにて、無駄に同一データを大量にSELECTしてしまっていたのを修正。

Location:

branches/version-2_13-dev/data

Files:

• Smarty/templates/default/mypage/history.tpl (modified) (1 diff)
• class/pages/mypage/LC_Page_Mypage_DownLoad.php (modified) (3 diffs)

branches/version-2_13-dev/data/Smarty/templates/default/mypage/history.tpl

@@ -83 +83 @@
                     <!--{if $orderDetail.product_type_id == $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
                         <!--{if $orderDetail.is_downloadable}-->
-                            <a target="_self" href="<!--{$smarty.const.ROOT_URLPATH}-->mypage/download.php?order_id=<!--{$tpl_arrOrderData.order_id}-->&product_id=<!--{$orderDetail.product_id}-->&product_class_id=<!--{$orderDetail.product_class_id}-->">ダウンロード</a>
+                            <a target="_self" href="<!--{$smarty.const.ROOT_URLPATH}-->mypage/download.php?order_id=<!--{$tpl_arrOrderData.order_id}-->&product_class_id=<!--{$orderDetail.product_class_id}-->">ダウンロード</a>
                         <!--{else}-->
                             <!--{if $orderDetail.payment_date == "" && $orderDetail.effective == "0"}-->

branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage_DownLoad.php

@@ -113 +113 @@
         $customer_id = $_SESSION['customer']['customer_id'];
         $order_id = $_GET['order_id'];
-        $product_id = $_GET['product_id'];
         $product_class_id = $_GET['product_class_id'];
 
         //DBから商品情報の読込
-        $arrForm = $this->lfGetRealFileName($customer_id, $order_id, $product_id, $product_class_id);
+        $arrForm = $this->lfGetRealFileName($customer_id, $order_id, $product_class_id);
 
         //ファイル情報が無い場合はNG
@@ -159 +158 @@
      * @param  integer $customer_id      会員ID
      * @param  integer $order_id         受注ID
-     * @param  integer $product_id       商品ID
      * @param  integer $product_class_id 商品規格ID
      * @return array   商品情報の配列
      */
-    public function lfGetRealFileName($customer_id, $order_id, $product_id, $product_class_id)
+    public function lfGetRealFileName($customer_id, $order_id, $product_class_id)
     {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
         $col = <<< __EOS__
-            pc.product_id AS product_id,
-            pc.product_class_id AS product_class_id,
             pc.down_realfilename AS down_realfilename,
-            pc.down_filename AS down_filename,
-            o.order_id AS order_id,
-            o.customer_id AS customer_id,
-            o.payment_date AS payment_date,
-            o.status AS status
+            pc.down_filename AS down_filename
 __EOS__;
 
         $table = <<< __EOS__
-            dtb_products_class pc,
-            dtb_order_detail od,
-            dtb_order o
+            dtb_order AS o
+            JOIN dtb_order_detail AS od USING(order_id)
+            JOIN dtb_products_class AS pc USING(product_id, product_class_id)
 __EOS__;
 
         $dbFactory = SC_DB_DBFactory_Ex::getInstance();
-        $where = 'o.customer_id = ? AND o.order_id = ? AND pc.product_id = ? AND pc.product_class_id = ?';
-        $where .= ' AND od.product_id = ? AND od.product_class_id = ?';
+        $where = 'o.customer_id = ? AND o.order_id = ? AND od.product_class_id = ?';
         $where .= ' AND ' . $dbFactory->getDownloadableDaysWhereSql('o');
         $where .= ' = 1';
-        $arrRet = $objQuery->select($col, $table, $where,
-                                    array($customer_id, $order_id, $product_id, $product_class_id, $product_id, $product_class_id));
+        $arrWhereVal = array($customer_id, $order_id, $product_class_id);
+        $arrRet = $objQuery->select($col, $table, $where, $arrWhereVal);
 
         return $arrRet[0];
@@ -199 +190 @@
         $objFormParam->addParam('customer_id', 'customer_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('order_id', 'order_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK'));
-        $objFormParam->addParam('product_id', 'product_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('product_class_id', 'product_class_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK'));
     }