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

Timestamp:

2010/09/22 13:23:00 (16 years ago)

Author:

eccuore

Message:

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

Location:

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

Files:

• SC_DB_DBFactory_MYSQL.php (modified) (2 diffs)
• SC_DB_DBFactory_PGSQL.php (modified) (2 diffs)

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

@@ -363 +363 @@
                         dtb_products.update_date,
                         dtb_products.deliv_date_id,
-                        dtb_products.down,
-                        dtb_products.down_filename,
-                        dtb_products.down_realfilename,
                         T4.product_code_min,
                         T4.product_code_max,
@@ -419 +416 @@
 __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

@@ -124 +124 @@
     function getDownloadableDaysWhereSql($dtb_order_alias) {
         $baseinfo = SC_Helper_DB_Ex::sf_getBasisData();
-        return "(SELECT CASE WHEN (SELECT d1.downloadable_days_unlimited FROM dtb_baseinfo d1) = 1 THEN 1 WHEN DATE(NOW()) <= DATE(" . $dtb_order_alias . ".commit_date + '". $baseinfo['downloadable_days'] ." days') THEN 1 ELSE 0 END)";
+        //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)";
     }
 
@@ -199 +202 @@
     /**
      * 文字コード情報を取得する
-     * 
+     *
      * @return array 文字コード情報
      */