Changeset 18824 for branches/version-2_5-dev/data/class/db

Timestamp:

2010/09/27 11:49:29 (16 years ago)

Author:

eccuore

Message:

#792(ダウンロード販売機能) vw_download_class削除、product_class_id対応（規格構成変更と並行作業中なので、作業途中の部分有）

Location:

branches/version-2_5-dev/data/class/db

Files:

• SC_DB_DBFactory.php (modified) (1 diff)
• dbfactory/SC_DB_DBFactory_MYSQL.php (modified) (2 diffs)
• dbfactory/SC_DB_DBFactory_PGSQL.php (modified) (1 diff)

branches/version-2_5-dev/data/class/db/SC_DB_DBFactory.php

@@ -125 +125 @@
      * ダウンロード販売の検索条件の SQL を返す.
      *
-     * @param string $dtb_order_alias
      * @return string 検索条件の SQL
      */
-    function getDownloadableDaysWhereSql($dtb_order_alias) { return null; }
+    function getDownloadableDaysWhereSql() { return null; }
 
     /**

branches/version-2_5-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php

@@ -142 +142 @@
      * @return string 検索条件の SQL
      */
-    function getDownloadableDaysWhereSql($dtb_order_alias) {
-        return "(SELECT IF((SELECT d1.downloadable_days_unlimited FROM dtb_baseinfo d1)=1, 1, DATE(NOW()) <= DATE(DATE_ADD(" . $dtb_order_alias . ".commit_date, INTERVAL (SELECT downloadable_days FROM dtb_baseinfo) DAY))))";
+    function getDownloadableDaysWhereSql() {
+        return "(SELECT IF((SELECT d1.downloadable_days_unlimited FROM dtb_baseinfo d1)=1, 1, DATE(NOW()) <= DATE(DATE_ADD(o.payment_date, INTERVAL (SELECT downloadable_days FROM dtb_baseinfo) DAY))))";
     }
 
@@ -415 +415 @@
                 )
 __EOS__;
-
-            $sql['vw_download_class'] = <<< __EOS__
-                (SELECT
-                    pc.product_id AS product_id,
-                    pc.classcategory_id1 AS classcategory_id1,
-                    pc.classcategory_id2 AS classcategory_id2,
-                    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
-                FROM
-                    dtb_products_class pc,
-                    dtb_order_detail od,
-                    dtb_order o
-                WHERE
-                    pc.product_id = od.product_id AND
-                    pc.classcategory_id1 = od.classcategory_id1 AND
-                    pc.classcategory_id2 = od.classcategory_id2 AND
-                    od.order_id = o.order_id
-                )
-__EOS__;
-
         }
 

branches/version-2_5-dev/data/class/db/dbfactory/SC_DB_DBFactory_PGSQL.php

@@ -122 +122 @@
      * @return string 検索条件の SQL
      */
-    function getDownloadableDaysWhereSql($dtb_order_alias) {
+    function getDownloadableDaysWhereSql() {
         $baseinfo = SC_Helper_DB_Ex::sf_getBasisData();
         //downloadable_daysにNULLが入っている場合(無期限ダウンロード可能時)もあるので、NULLの場合は0日に補正
         $downloadable_days = $baseinfo['downloadable_days'];
         if($downloadable_days ==null || $downloadable_days == "")$downloadable_days=0;
-        return "(SELECT CASE WHEN (SELECT d1.downloadable_days_unlimited FROM dtb_baseinfo d1) = 1 AND " . $dtb_order_alias . ".payment_date IS NOT NULL THEN 1 WHEN DATE(NOW()) <= DATE(" . $dtb_order_alias . ".payment_date + '". $downloadable_days ." days') THEN 1 ELSE 0 END)";
+        return "(SELECT CASE WHEN (SELECT d1.downloadable_days_unlimited FROM dtb_baseinfo d1) = 1 AND o.payment_date IS NOT NULL THEN 1 WHEN DATE(NOW()) <= DATE(o.payment_date + '". $downloadable_days ." days') THEN 1 ELSE 0 END)";
     }