diff --git a/app/common/dao/user/UserExtractDao.php b/app/common/dao/user/UserExtractDao.php index 8323d69c..95ffb0bb 100644 --- a/app/common/dao/user/UserExtractDao.php +++ b/app/common/dao/user/UserExtractDao.php @@ -44,6 +44,8 @@ class UserExtractDao extends BaseDao $query->where('UserExtract.real_name','%'.$where['real_name'].'%'); })->when(isset($where['date']) && $where['date'] != '',function($query)use($where){ getModelTime($query, $where['date']); + })->when(isset($where['source']) && $where['source'] != '',function($query)use($where){ + $query->where('UserExtract.source',$where['source']); })->order('UserExtract.create_time DESC'); return $query; diff --git a/app/controller/api/user/UserExtract.php b/app/controller/api/user/UserExtract.php index 186e6855..2b2d95e4 100644 --- a/app/controller/api/user/UserExtract.php +++ b/app/controller/api/user/UserExtract.php @@ -39,7 +39,7 @@ class UserExtract extends BaseController public function lst() { [$page,$limit] = $this->getPage(); - $where = $this->request->params(['status']); + $where = $this->request->params(['status', 'source']); $where['uid'] = $this->request->uid(); return app('json')->success($this->repository->getList($where,$page,$limit)); } diff --git a/app/validate/api/UserExtractValidate.php b/app/validate/api/UserExtractValidate.php index c463f60c..675a6b1f 100644 --- a/app/validate/api/UserExtractValidate.php +++ b/app/validate/api/UserExtractValidate.php @@ -26,6 +26,7 @@ class UserExtractValidate extends Validate 'extract_type|收款方式' => 'require', 'extract_price|提现金额' => 'require|gt:0', 'alipay_code|支付宝账户' => 'requireIf:extract_type,2', + 'source|提现来源' => 'require|in:1,2', ]; }