From 971baa32bfe9a951871bc2f3616d94d15727b262 Mon Sep 17 00:00:00 2001 From: wucongxing8150 <815046773@qq.com> Date: Mon, 22 Apr 2024 15:36:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=8F=90=E7=8E=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controller/DoctorAccountController.php | 7 +--- app/Request/DoctorAccountRequest.php | 3 -- app/Services/DoctorAccountService.php | 43 ++++++---------------- config/routes.php | 2 +- 4 files changed, 13 insertions(+), 42 deletions(-) diff --git a/app/Controller/DoctorAccountController.php b/app/Controller/DoctorAccountController.php index e4acb19..89c65a9 100644 --- a/app/Controller/DoctorAccountController.php +++ b/app/Controller/DoctorAccountController.php @@ -50,21 +50,16 @@ class DoctorAccountController extends AbstractController /** * 获取提现数据 * @return ResponseInterface - * @throws ContainerExceptionInterface - * @throws NotFoundExceptionInterface */ public function getDoctorWithdrawalInfo(): ResponseInterface { - $request = $this->container->get(DoctorAccountRequest::class); - $request->scene('getDoctorWithdrawalInfo')->validateResolved(); - $DoctorAccountService = new DoctorAccountService(); $data = $DoctorAccountService->getDoctorWithdrawalInfo(); return $this->response->json($data); } /** - * 获取可提现问诊订单列表 + * 获取可提现订单列表 * @return ResponseInterface */ public function getDoctorWithdrawalOrderList(): ResponseInterface diff --git a/app/Request/DoctorAccountRequest.php b/app/Request/DoctorAccountRequest.php index e507033..290d756 100644 --- a/app/Request/DoctorAccountRequest.php +++ b/app/Request/DoctorAccountRequest.php @@ -19,9 +19,6 @@ class DoctorAccountRequest extends FormRequest 'getDoctorWithdrawalRecordList' => [ // 获取医生提现记录列表 'year', ], - 'getDoctorWithdrawalInfo' => [ // 获取提现数据 - 'order_inquiry_ids', - ], 'addDoctorWithdrawal' => [ // 发起提现 'order_inquiry_id', 'withdrawal_amount_total', diff --git a/app/Services/DoctorAccountService.php b/app/Services/DoctorAccountService.php index 9271e15..cf9c3ce 100644 --- a/app/Services/DoctorAccountService.php +++ b/app/Services/DoctorAccountService.php @@ -236,8 +236,6 @@ class DoctorAccountService extends BaseService { $user_info = $this->request->getAttribute("userInfo") ?? []; - $order_inquiry_ids = $this->request->input('order_inquiry_ids'); - // 获取医生信息 $params = array(); $params['doctor_id'] = $user_info['client_user_id']; @@ -263,7 +261,6 @@ class DoctorAccountService extends BaseService return fail(HttpEnumCode::HTTP_ERROR, "非法医生"); } - // 检测医生身份认证 $UserDoctorService = new UserDoctorService(); $res = $UserDoctorService->checkDoctorAuth($user_doctor); @@ -292,42 +289,25 @@ class DoctorAccountService extends BaseService $bank['bank_card_name_mask'] = $user_doctor_info['card_name_mask']; $amount_total = 0; - $order_inquiry_id_array = []; + + // 获取医生账户总表 + // 获取医生账户余额 - if (!empty($order_inquiry_ids)){ - $params = array(); - $params['doctor_id'] = $user_info['client_user_id']; - $params['inquiry_status'] = 6; // inquiry_status：问诊订单状态（1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消） - $params['inquiry_refund_status'] = 0; // inquiry_refund_status：问诊订单退款状态（0:无退款 1:申请退款 2:退款中 3:退款成功 4:拒绝退款 5:退款关闭） - - $in_params = explode(',',$order_inquiry_ids); - $order_inquiry = OrderInquiry::getInList($params,$in_params); - if (!empty($order_inquiry)){ - foreach ($order_inquiry as $value){ - $amount_total = bcadd((string)$amount_total,(string)$value["amount_total"],2); - } - } - - $order_inquiry_id_array = $in_params; + $InquiryService = new InquiryService(); + if ($user_doctor['is_platform_deep_cooperation'] == 0){ + $order_inquiry = $InquiryService->getDoctorCanWithdrawalInquiryOrder($user_info['client_user_id']); }else{ - $InquiryService = new InquiryService(); - if ($user_doctor['is_platform_deep_cooperation'] == 0){ - $order_inquiry = $InquiryService->getDoctorCanWithdrawalInquiryOrder($user_info['client_user_id']); - }else{ - $order_inquiry = $InquiryService->getCooperationDoctorCanWithdrawalInquiryOrder($user_info['client_user_id']); - } + $order_inquiry = $InquiryService->getCooperationDoctorCanWithdrawalInquiryOrder($user_info['client_user_id']); + } - if (!empty($order_inquiry)){ - foreach ($order_inquiry as $value){ - $amount_total = bcadd((string)$amount_total,(string)$value["amount_total"],2); - } - $order_inquiry_id_array = array_column($order_inquiry,'order_inquiry_id'); + if (!empty($order_inquiry)){ + foreach ($order_inquiry as $value){ + $amount_total = bcadd((string)$amount_total,(string)$value["amount_total"],2); } } $amount_total = bcmul((string)$amount_total,"0.75",2); - // 计算医生个人所得税 $income_tax = $this->computeIndividualIncomeTax($amount_total); @@ -340,7 +320,6 @@ class DoctorAccountService extends BaseService $result['amount_total'] = $amount_total; // 账户余额 $result['withdrawal_amount'] = $withdrawal_amount; // 提现金额 $result['income_tax'] = $income_tax; // 个人所得税 - $result['order_inquiry_ids'] = $order_inquiry_id_array; // 订单合集 return success($result); } diff --git a/config/routes.php b/config/routes.php index fc2cdbe..75ca065 100644 --- a/config/routes.php +++ b/config/routes.php @@ -217,7 +217,7 @@ Router::addGroup('/doctor', function () { // 获取提现数据 Router::post('/info', [DoctorAccountController::class, 'getDoctorWithdrawalInfo']); - // 获取可提现问诊订单列表 + // 获取可提现订单列表 Router::get('/order', [DoctorAccountController::class, 'getDoctorWithdrawalOrderList']); // 获取医生提现记录列表