|
|
@@ -1264,11 +1264,13 @@ class ROrderController extends AdminController{
|
|
|
for ($i=0;$i<=2;$i++){
|
|
|
$order_criteria = new EMongoCriteria();
|
|
|
$order_criteria->type('==', $value['type']);
|
|
|
+
|
|
|
//1 7 8 14 15 21
|
|
|
- $start_time = mktime(0, 0, 0, date('m'), date('d')-(7*$i+1), date('Y'));
|
|
|
- $end_time = mktime(23, 59, 59, date('m'), date('d')-(($i+1)*7), date('Y'));
|
|
|
- $order_criteria->booking_time('>=', $start_time);
|
|
|
- $order_criteria->booking_time('<=', $end_time);
|
|
|
+ $start_time = mktime(23, 59, 59, date('m'), date('d')-(7*$i+1), date('Y'));
|
|
|
+ $end_time = mktime(0, 0, 0, date('m'), date('d')-(($i+1)*7), date('Y'));
|
|
|
+
|
|
|
+ $order_criteria->booking_time('<=', $start_time);
|
|
|
+ $order_criteria->booking_time('>=', $end_time);
|
|
|
$orders = ROrder::model()->findAll($order_criteria);
|
|
|
$data[$i+1][0] = date('m-d', $start_time);
|
|
|
$data[$i+1][$key+1] = count($orders) == 0?1:count($orders)+1;
|
north