修改服务通知排序,修改医生我的账户接口
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user