|
@@ -27,13 +27,16 @@ class order extends Api
|
|
|
|
|
|
if($active_status == 1){
|
|
if($active_status == 1){
|
|
$where['active.activestarttime'] = ['gt',time()];
|
|
$where['active.activestarttime'] = ['gt',time()];
|
|
|
|
+ $where['order.status'] = 1;
|
|
}
|
|
}
|
|
if($active_status == 2){
|
|
if($active_status == 2){
|
|
$where['active.activestarttime'] = ['lt',time()];
|
|
$where['active.activestarttime'] = ['lt',time()];
|
|
$where['active.activeendtime'] = ['gt',time()];
|
|
$where['active.activeendtime'] = ['gt',time()];
|
|
|
|
+ $where['order.status'] = 1;
|
|
}
|
|
}
|
|
if($active_status == 3){
|
|
if($active_status == 3){
|
|
$where['active.activeendtime'] = ['lt',time()];
|
|
$where['active.activeendtime'] = ['lt',time()];
|
|
|
|
+ $where['order.status'] = 1;
|
|
}
|
|
}
|
|
if($active_status == 4){
|
|
if($active_status == 4){
|
|
$where['order.pay_type'] = 2;
|
|
$where['order.pay_type'] = 2;
|