diff --git a/app/Amqp/Consumer/AutoFinishInquiryDelayDirectConsumer.php b/app/Amqp/Consumer/AutoFinishInquiryDelayDirectConsumer.php index 23625e3..c30280a 100644 --- a/app/Amqp/Consumer/AutoFinishInquiryDelayDirectConsumer.php +++ b/app/Amqp/Consumer/AutoFinishInquiryDelayDirectConsumer.php @@ -62,6 +62,8 @@ class AutoFinishInquiryDelayDirectConsumer extends ConsumerMessage return Result::DROP; } + $order_inquiry = $order_inquiry->toArray(); + // 问诊订单状态(1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消) if ($order_inquiry['inquiry_status'] != 5) { Db::rollBack(); diff --git a/app/Request/DoctorAccountRequest.php b/app/Request/DoctorAccountRequest.php index c70233c..eda2b06 100644 --- a/app/Request/DoctorAccountRequest.php +++ b/app/Request/DoctorAccountRequest.php @@ -23,8 +23,8 @@ class DoctorAccountRequest extends FormRequest 'order_inquiry_ids', ], 'addDoctorWithdrawal' => [ // 发起提现 - 'order_inquiry_ids', - 'order_inquiry_ids', + 'order_inquiry_id', + 'order_inquiry_id', ], ]; diff --git a/app/Services/DoctorAccountService.php b/app/Services/DoctorAccountService.php index f4b7348..fa4897b 100644 --- a/app/Services/DoctorAccountService.php +++ b/app/Services/DoctorAccountService.php @@ -257,7 +257,7 @@ class DoctorAccountService extends BaseService $order_inquiry = OrderInquiry:: getDoctorOrderInquiryPage($params, $fields,$page,$per_page); if (!empty($order_inquiry['data'])) { foreach ($order_inquiry['data'] as &$item) { - $item['amount_total'] = ceil($item['total_amount'] * 0.75 * 100) / 100; + $item['expected_amount_total'] = ceil($item['amount_total'] * 0.75 * 100) / 100; } }