From c86a48d74f8bbb29a1022ba78000884efe4ff1ae Mon Sep 17 00:00:00 2001
From: monanxiao <monanxiao@qq.com>
Date: Wed, 8 Mar 2023 16:38:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8F=90=E7=8E=B0=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=8F=90?=
 =?UTF-8?q?=E7=8E=B0=E6=9D=A5=E6=BA=90=EF=BC=8C=E5=8C=BA=E5=88=86=E5=B0=8F?=
 =?UTF-8?q?=E7=BB=84=E9=87=87=E8=B4=AD=E3=80=81=E5=88=86=E9=94=80=E6=8E=A8?=
 =?UTF-8?q?=E5=B9=BF=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/dao/user/UserExtractDao.php   | 2 ++
 app/controller/api/user/UserExtract.php  | 2 +-
 app/validate/api/UserExtractValidate.php | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

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',
     ];
 
 }