diff --git a/app/controller/admin/user/UserBill.php b/app/controller/admin/user/UserBill.php index 5f672d1d..850e3b3d 100644 --- a/app/controller/admin/user/UserBill.php +++ b/app/controller/admin/user/UserBill.php @@ -58,15 +58,17 @@ class UserBill extends BaseController $query= Db::name('margin_order')->where('paid',1); if(isset($where['date'])&& $where['date']!=''){ $a=explode(' ',$where['date']); - $query->whereTime('birthday', 'between', [$a[0],$a[1]]); + $query->whereTime('create_time', 'between', [$a[0],$a[1]]); } if(isset($where['keyword'])&& $where['keyword']!=''){ $a=Db::name('merchant')->whereLike('mer_name',$where['mer_name'])->column('mer_id'); $query->where('mer_id', 'in', [$a[0],$a[1]]); } + if(isset($where['mer_id'])&& $where['mer_id']!=''){ $query->where('mer_id', $where['mer_id']); } + $count=$query->count(); $list=$query->withAttr('mer_name',function($value,$data){