This commit is contained in:
mkm 2023-10-08 16:45:55 +08:00
parent ef513bba6e
commit 182ccfce56

View File

@ -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){