|
@@ -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);
|
|
$order = Dever::db('act/order')->fetchAll($sql);
|
|
|
|
|
|
if ($order) {
|
|
if ($order) {
|