From a5599a5bc1dff3d443cc8338fdfa57ef93aa4e50 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Fri, 7 Apr 2023 11:02:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=8E=B0=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Services/DoctorAccountService.php | 15 +++++++++++----
 app/Services/InquiryService.php       |  9 ++++-----
 config/routes.php                     |  2 +-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/Services/DoctorAccountService.php b/app/Services/DoctorAccountService.php
index 53089ce..626dfc2 100644
--- a/app/Services/DoctorAccountService.php
+++ b/app/Services/DoctorAccountService.php
@@ -186,6 +186,8 @@ class DoctorAccountService extends BaseService
         $bank['bank_name'] = $doctor_bank_card['BasicBank']['bank_name'];
         $bank['bank_card_code_mask'] = $doctor_bank_card['bank_card_code_mask'];
 
+        $balance_account = 0;
+        $order_inquiry_ids = [];
         // 获取医生账户余额
         if (!empty($order_inquiry_ids)){
             $params = array();
@@ -195,14 +197,18 @@ class DoctorAccountService extends BaseService
 
             $in_params = explode(',',$order_inquiry_ids);
             $order_inquiry = OrderInquiry::getInList($params,$in_params);
-            if (empty($order_inquiry)){
-                $balance_account = 0;
-            }else{
+            if (!empty($order_inquiry)){
                 $balance_account = array_sum(array_column($order_inquiry->toArray(),'amount_total'));
             }
+
+            $order_inquiry_ids = $in_params;
         }else{
             $InquiryService = new InquiryService();
-            $balance_account = $InquiryService->getDoctorCanWithdrawalAmountTotal($user_info['client_user_id']);
+            $order_inquiry = $InquiryService->getDoctorCanWithdrawalInquiryOrder($user_info['client_user_id']);
+            if (!empty($order_inquiry)){
+                $balance_account = array_sum(array_column($order_inquiry,'amount_total'));
+                $order_inquiry_ids = array_column($order_inquiry,'order_inquiry_id');
+            }
         }
 
         if ($balance_account > 0) {
@@ -220,6 +226,7 @@ class DoctorAccountService extends BaseService
         $result['bank'] = $bank;//银行数据
         $result['withdrawal_amount'] = $withdrawal_amount; // 提现金额
         $result['income_tax'] = $income_tax; // 个人所得税
+        $result['order_inquiry_ids'] = $order_inquiry_ids; // 订单合集
 
         return success($result);
     }
diff --git a/app/Services/InquiryService.php b/app/Services/InquiryService.php
index 057f4f7..c79fcae 100644
--- a/app/Services/InquiryService.php
+++ b/app/Services/InquiryService.php
@@ -814,9 +814,9 @@ class InquiryService extends BaseService
     /**
      * 获取医生可提现金额
      * @param string $doctor_id
-     * @return int
+     * @return array
      */
-    public function getDoctorCanWithdrawalAmountTotal(string $doctor_id): int
+    public function getDoctorCanWithdrawalInquiryOrder(string $doctor_id): array
     {
         // 获取医生当日接诊订单金额
         $params = array();
@@ -829,11 +829,10 @@ class InquiryService extends BaseService
 
         $order_inquiry = OrderInquiry::getList($params);
         if (empty($order_inquiry)){
-            return 0;
+            return [];
         }
 
-        $order_inquiry = $order_inquiry->toArray();
-        return array_sum(array_column($order_inquiry,'amount_total'));
+        return $order_inquiry->toArray();
     }
 
     /**
diff --git a/config/routes.php b/config/routes.php
index 78ef251..aab06f2 100644
--- a/config/routes.php
+++ b/config/routes.php
@@ -128,7 +128,7 @@ Router::addGroup('/doctor', function () {
     // 提现
     Router::addGroup('/withdrawal', function () {
         // 获取提现数据
-        Router::post('info', [DoctorAccountController::class, 'getDoctorWithdrawalInfo']);
+        Router::post('/info', [DoctorAccountController::class, 'getDoctorWithdrawalInfo']);
 
         // 获取可提现问诊订单列表
         Router::get('/order', [DoctorAccountController::class, 'getDoctorWithdrawalOrderList']);