mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2023-10-08 16:09:31 +08:00
parent 792b6ef647
commit ef513bba6e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/controller/admin/user/UserBill.php
View File

@ -53,17 +53,20 @@ class UserBill extends BaseController
} }
public function deposit(){ public function deposit(){
$where = $this->request->params(['keyword', 'date']); $where = $this->request->params(['keyword', 'date','mer_id']);
[$page, $limit] = $this->getPage(); [$page, $limit] = $this->getPage();
$query= Db::name('margin_order')->where('paid',1); $query= Db::name('margin_order')->where('paid',1);
if(isset($where['date'])&& $where['date']!=''){ if(isset($where['date'])&& $where['date']!=''){
$a=explode(' ',$where['date']); $a=explode(' ',$where['date']);
$query->whereTime('birthday', 'between', [$a[0],$a[1]]); $query->whereTime('birthday', 'between', [$a[0],$a[1]]);
} }
if(isset($where['keyword'])&& $where['date']!=''){ if(isset($where['keyword'])&& $where['keyword']!=''){
$a=Db::name('merchant')->whereLike('mer_name',$where['mer_name'])->column('mer_id'); $a=Db::name('merchant')->whereLike('mer_name',$where['mer_name'])->column('mer_id');
$query->where('mer_id', 'in', [$a[0],$a[1]]); $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(); $count=$query->count();
$list=$query->withAttr('mer_name',function($value,$data){ $list=$query->withAttr('mer_name',function($value,$data){