|
@@ -308,7 +308,7 @@ class OrderPay extends Base{
|
|
|
if($end!=""){
|
|
|
$condition[]=["trade_time","<=",$end." 23:59:59"];
|
|
|
}
|
|
|
- if($status!==""){
|
|
|
+ if($status!==""){
|
|
|
$condition[]=["status","=",$status];
|
|
|
}
|
|
|
$count=Db::name("trade")->where($condition)->count();
|
|
@@ -403,7 +403,7 @@ class OrderPay extends Base{
|
|
|
$condition[]=["a.addtime",">=",date("Y-m-d 00:00:00",strtotime($start))];
|
|
|
}
|
|
|
if($end!=""){
|
|
|
- $condition[]=["a.addtime","<=",date("Y-m-d 23:59:59",strtotime($start))];
|
|
|
+ $condition[]=["a.addtime","<=",date("Y-m-d 23:59:59",strtotime($end))];
|
|
|
}
|
|
|
if($status!==""){
|
|
|
$condition[]=["a.status","=",$status];
|