gdxz/hospital-applets-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改提现路由

Browse Source
This commit is contained in:
wucongxing 2023-04-07 11:02:59 +08:00
parent b4beb81d6f
commit a5599a5bc1
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Services/DoctorAccountService.php
View File

@ -186,6 +186,8 @@ class DoctorAccountService extends BaseService
$bank['bank_name'] = $doctor_bank_card['BasicBank']['bank_name']; $bank['bank_name'] = $doctor_bank_card['BasicBank']['bank_name'];
$bank['bank_card_code_mask'] = $doctor_bank_card['bank_card_code_mask']; $bank['bank_card_code_mask'] = $doctor_bank_card['bank_card_code_mask'];
$balance_account = 0;
$order_inquiry_ids = [];
// 获取医生账户余额 // 获取医生账户余额
if (!empty($order_inquiry_ids)){ if (!empty($order_inquiry_ids)){
$params = array(); $params = array();
@ -195,14 +197,18 @@ class DoctorAccountService extends BaseService
$in_params = explode(',',$order_inquiry_ids); $in_params = explode(',',$order_inquiry_ids);
$order_inquiry = OrderInquiry::getInList($params,$in_params); $order_inquiry = OrderInquiry::getInList($params,$in_params);
if (empty($order_inquiry)){ if (!empty($order_inquiry)){
$balance_account = 0;
}else{
$balance_account = array_sum(array_column($order_inquiry->toArray(),'amount_total')); $balance_account = array_sum(array_column($order_inquiry->toArray(),'amount_total'));
} }
$order_inquiry_ids = $in_params;
}else{ }else{
$InquiryService = new InquiryService(); $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) { if ($balance_account > 0) {
@ -220,6 +226,7 @@ class DoctorAccountService extends BaseService
$result['bank'] = $bank;//银行数据 $result['bank'] = $bank;//银行数据
$result['withdrawal_amount'] = $withdrawal_amount; // 提现金额 $result['withdrawal_amount'] = $withdrawal_amount; // 提现金额
$result['income_tax'] = $income_tax; // 个人所得税 $result['income_tax'] = $income_tax; // 个人所得税
$result['order_inquiry_ids'] = $order_inquiry_ids; // 订单合集
return success($result); return success($result);
} }

9
app/Services/InquiryService.php
View File

@ -814,9 +814,9 @@ class InquiryService extends BaseService
/** /**
* 获取医生可提现金额 * 获取医生可提现金额
* @param string $doctor_id * @param string $doctor_id
* @return int * @return array
*/ */
public function getDoctorCanWithdrawalAmountTotal(string $doctor_id): int public function getDoctorCanWithdrawalInquiryOrder(string $doctor_id): array
{ {
// 获取医生当日接诊订单金额 // 获取医生当日接诊订单金额
$params = array(); $params = array();
@ -829,11 +829,10 @@ class InquiryService extends BaseService
$order_inquiry = OrderInquiry::getList($params); $order_inquiry = OrderInquiry::getList($params);
if (empty($order_inquiry)){ if (empty($order_inquiry)){
return 0; return [];
} }
$order_inquiry = $order_inquiry->toArray(); return $order_inquiry->toArray();
return array_sum(array_column($order_inquiry,'amount_total'));
} }
/** /**

2
config/routes.php
View File

@ -128,7 +128,7 @@ Router::addGroup('/doctor', function () {
// 提现 // 提现
Router::addGroup('/withdrawal', function () { Router::addGroup('/withdrawal', function () {
// 获取提现数据 // 获取提现数据
Router::post('info', [DoctorAccountController::class, 'getDoctorWithdrawalInfo']); Router::post('/info', [DoctorAccountController::class, 'getDoctorWithdrawalInfo']);
// 获取可提现问诊订单列表 // 获取可提现问诊订单列表
Router::get('/order', [DoctorAccountController::class, 'getDoctorWithdrawalOrderList']); Router::get('/order', [DoctorAccountController::class, 'getDoctorWithdrawalOrderList']);