dever 5 years ago
parent
commit
c53e01d1b2
2 changed files with 2 additions and 2 deletions
  1. 1 1
      stat/lib/Journal.php
  2. 1 1
      stat/lib/Source.php

+ 1 - 1
stat/lib/Journal.php

@@ -94,7 +94,7 @@ class Journal
         }
         */
 
-        $sql = 'select * from wonderful_act_order where type = 3 and product_id = '.$info['id'].' and status = 2 and state = 1 and cdate >= '.$where['start'].' and cdate <= '.$where['end'];
+        $sql = 'select * from wonderful_act_order where type in(1,3) and product_id = '.$info['id'].' and status = 2 and state = 1 and cdate >= '.$where['start'].' and cdate <= '.$where['end'];
         $order = Dever::db('act/order')->fetchAll($sql);
         if ($order) {
             

+ 1 - 1
stat/lib/Source.php

@@ -91,7 +91,7 @@ class Source
         }
         */
 
-        $sql = 'select * from wonderful_act_order where type = 3 and source = '.$source['id'].' and product_id = '.$info['id'].' and status = 2 and state = 1 and cdate >= '.$where['start'].' and cdate <= '.$where['end'];
+        $sql = 'select * from wonderful_act_order where type in(1,3) and source = '.$source['id'].' and product_id = '.$info['id'].' and status = 2 and state = 1 and cdate >= '.$where['start'].' and cdate <= '.$where['end'];
         $order = Dever::db('act/order')->fetchAll($sql);
 
         if ($order) {