From 34421d211563b81a08d5b202f8b98d79db19716c Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Fri, 24 Feb 2023 10:51:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8C=BB=E7=94=9F=E6=8F=90?=
 =?UTF-8?q?=E7=8E=B0=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Model/DoctorWithdrawal.php        | 33 +++++++++++++++++++++++----
 app/Services/DoctorAccountService.php |  5 ++++
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/app/Model/DoctorWithdrawal.php b/app/Model/DoctorWithdrawal.php
index 7356f18..9a20151 100644
--- a/app/Model/DoctorWithdrawal.php
+++ b/app/Model/DoctorWithdrawal.php
@@ -7,6 +7,7 @@ namespace App\Model;
 
 
 use Hyperf\Database\Model\Collection;
+use Hyperf\Database\Model\Relations\HasOne;
 use Hyperf\Snowflake\Concern\Snowflake;
 
 /**
@@ -46,6 +47,14 @@ class DoctorWithdrawal extends Model
 
     protected string $primaryKey = "withdrawal_id";
 
+    /**
+     * 关联银行表
+     */
+    public function BasicBank(): HasOne
+    {
+        return $this->hasOne(BasicBank::class, 'bank_id', 'bank_id');
+    }
+
     /**
      * 获取信息-单条
      * @param array $params
@@ -69,14 +78,30 @@ class DoctorWithdrawal extends Model
     }
 
     /**
-     * 获取某一时间区间数据
+     * 获取某一时间区间分页数据
      * @param array $params
      * @param array $created_at_params
      * @param array $fields
-     * @return Collection|array
+     * @param int|null $page
+     * @param int|null $per_page
+     * @return array
      */
-    public static function getDateList(array $params,array $created_at_params, array $fields = ['*']): Collection|array
+    public static function getDatePage(array $params,array $created_at_params, array $fields = ['*'], int $page = null, ?int $per_page = 10): array
     {
-        return self::where($params)->whereBetween('created_at',$created_at_params)->get($fields);
+        $raw = self::with([
+            'BasicBank'
+        ])
+            ->where($params)
+            ->whereBetween('created_at',$created_at_params)
+            ->paginate($per_page, $fields, "page", $page);
+
+        $data = array();
+        $data['current_page'] = $raw->currentPage();// 当前页码
+        $data['total'] = $raw->total();//数据总数
+        $data['data'] = $raw->items();//数据
+        $data['per_page'] = $raw->perPage();//每页个数
+        $data['last_page'] = $raw->lastPage();//最后一页
+
+        return $data;
     }
 }
diff --git a/app/Services/DoctorAccountService.php b/app/Services/DoctorAccountService.php
index cdcacae..3b65201 100644
--- a/app/Services/DoctorAccountService.php
+++ b/app/Services/DoctorAccountService.php
@@ -262,7 +262,12 @@ class DoctorAccountService extends BaseService
 
         $params = array();
         $params['doctor_id'] = $user_info['client_user_id'];
+        $doctor_withdrawal = DoctorWithdrawal::getDatePage($params,$created_at_params);
+        if (empty($doctor_withdrawal['data'])){
+            return success();
+        }
 
+        return success($doctor_withdrawal);
 
     }