|
|
@@ -93,7 +93,7 @@ class TradeService extends BaseService
|
|
|
->where($where)
|
|
|
->where('a.status','>', 0)
|
|
|
->where(function($query) use($type){
|
|
|
- if($type == 1 || $type == 3){
|
|
|
+ if($type){
|
|
|
$query->where('create_time','>=', strtotime(date('Y-m-d')));
|
|
|
}
|
|
|
})
|
|
|
@@ -507,6 +507,7 @@ class TradeService extends BaseService
|
|
|
->where(function ($query) use ($status) {
|
|
|
$query->whereIn('status', is_array($status) ? $status : [$status]);
|
|
|
})
|
|
|
+ ->where('create_time','>=',strtotime(date('Y-m-d')))
|
|
|
->select(['status', DB::raw('count(*) as count')])
|
|
|
->groupBy('status')
|
|
|
->get();
|