修改服务通知排序，修改医生我的账户接口

app/Services/DoctorAccountService.php

@@ -180,11 +180,11 @@ class DoctorAccountService extends BaseService
             return success();
         }
 
-        $result = array();
-        $result['bank_card_id'] = $doctor_bank_card['bank_card_id'];
-        $result['bank_icon_path'] = $doctor_bank_card['BasicBank']['bank_icon_path'];
-        $result['bank_name'] = $doctor_bank_card['BasicBank']['bank_name'];
-        $result['bank_card_code_mask'] = $doctor_bank_card['bank_card_code_mask'];
+        $bank = array();
+        $bank['bank_card_id'] = $doctor_bank_card['bank_card_id'];
+        $bank['bank_icon_path'] = $doctor_bank_card['BasicBank']['bank_icon_path'];
+        $bank['bank_name'] = $doctor_bank_card['BasicBank']['bank_name'];
+        $bank['bank_card_code_mask'] = $doctor_bank_card['bank_card_code_mask'];
 
         // 获取医生账户余额
         if (!empty($order_inquiry_ids)){
@@ -201,7 +201,8 @@ class DoctorAccountService extends BaseService
                 $balance_account = array_sum(array_column($order_inquiry->toArray(),'amount_total'));
             }
         }else{
-            $balance_account = $this->getDoctorBalanceAccount($user_info['client_user_id']);
+            $InquiryService = new InquiryService();
+            $balance_account = $InquiryService->getDoctorCanWithdrawalAmountTotal($user_info['client_user_id']);
         }
 
         if ($balance_account > 0) {
@@ -211,10 +212,14 @@ class DoctorAccountService extends BaseService
         // 计算医生个人所得税
         $income_tax = $this->computeIndividualIncomeTax($balance_account);
 
-        $result['withdrawal_amount'] = floor(($balance_account - $income_tax) * 100) / 100;
+        $withdrawal_amount = floor(($balance_account - $income_tax) * 100) / 100;
 
         $income_tax = floor($income_tax * 100) / 100;
-        $result['income_tax'] = $income_tax;
+
+        $result = array();
+        $result['bank'] = $bank;//银行数据
+        $result['withdrawal_amount'] = $withdrawal_amount; // 提现金额
+        $result['income_tax'] = $income_tax; // 个人所得税
 
         return success($result);
     }

app/Services/InquiryService.php

@@ -799,17 +799,43 @@ class InquiryService extends BaseService
         $params['doctor_id'] = $doctor_id;
         $params['inquiry_refund_status'] = 0; // 问诊订单退款状态（0:无退款 1:申请退款 2:退款中 3:退款成功 4:拒绝退款 5:退款关闭）
         $params['inquiry_pay_status'] = 2; // 支付状态（1:未支付 2:已支付 3:支付中 4:支付失败 5:支付超时 6:支付关闭 7:已撤销 8:转入退款）
-        $params['settlement_status'] = 0; // 订单与医生结算状态（0:未结算 1:已结算）
+        $params['is_withdrawal'] = 0; // 是否提现（0:否 1:是 2:提现中）
 
         $reception_time = [$start_date, $end_date];
 
         $inquiry_status_params = [4, 5]; // 问诊订单状态（1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消）
 
-        $amount_total_sum = OrderInquiry::getOrderInquiryAmountTotalSum($params, $reception_time, $inquiry_status_params);
+        $amount_total_sum = OrderInquiry::getOrderInquiryBetweenTimeAmountTotalSum($params, $reception_time, $inquiry_status_params);
 
         return $amount_total_sum ?: 0;
     }
 
+
+    /**
+     * 获取医生可提现金额
+     * @param string $doctor_id
+     * @return int
+     */
+    public function getDoctorCanWithdrawalAmountTotal(string $doctor_id): int
+    {
+        // 获取医生当日接诊订单金额
+        $params = array();
+        $params['doctor_id'] = $doctor_id;
+        $params['inquiry_refund_status'] = 0; // 问诊订单退款状态（0:无退款 1:申请退款 2:退款中 3:退款成功 4:拒绝退款 5:退款关闭）
+        $params['inquiry_pay_status'] = 2; // 支付状态（1:未支付 2:已支付 3:支付中 4:支付失败 5:支付超时 6:支付关闭 7:已撤销 8:转入退款）
+        $params['statistics_status'] = 1; // 订单统计状态（0:未统计 1:已统计 2:统计失败）
+        $params['is_withdrawal'] = 0; // 是否提现（0:否 1:是 2:提现中）
+        $params['inquiry_status'] = 6; // 问诊订单状态（1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消）
+
+        $order_inquiry = OrderInquiry::getList($params);
+        if (empty($order_inquiry)){
+            return 0;
+        }
+
+        $order_inquiry = $order_inquiry->toArray();
+        return array_sum(array_column($order_inquiry,'amount_total'));
+    }
+
     /**
      * 获取患者某一状态下的问诊订单数量
      * @param string $patient_id 患者id

app/Services/UserDoctorService.php

@@ -2162,4 +2162,7 @@ class UserDoctorService extends BaseService
         $inquiry_status_params = [1,3,4];
         return OrderInquiry::getInquiryStatusCount($params,$inquiry_status_params);
     }
+
+    // 获取医生已完成订单总额
+
 }