新增自动完成队列服务开发。修改医生完成问诊接口
This commit is contained in:
@@ -187,7 +187,7 @@ class DoctorAccountService extends BaseService
|
||||
$bank['bank_card_code_mask'] = $doctor_bank_card['bank_card_code_mask'];
|
||||
|
||||
$balance_account = 0;
|
||||
$order_inquiry_ids = [];
|
||||
$order_inquiry_id_array = [];
|
||||
// 获取医生账户余额
|
||||
if (!empty($order_inquiry_ids)){
|
||||
$params = array();
|
||||
@@ -201,13 +201,13 @@ class DoctorAccountService extends BaseService
|
||||
$balance_account = array_sum(array_column($order_inquiry->toArray(),'amount_total'));
|
||||
}
|
||||
|
||||
$order_inquiry_ids = $in_params;
|
||||
$order_inquiry_id_array = $in_params;
|
||||
}else{
|
||||
$InquiryService = new InquiryService();
|
||||
$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');
|
||||
$order_inquiry_id_array = array_column($order_inquiry,'order_inquiry_id');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -226,7 +226,7 @@ class DoctorAccountService extends BaseService
|
||||
$result['bank'] = $bank;//银行数据
|
||||
$result['withdrawal_amount'] = $withdrawal_amount; // 提现金额
|
||||
$result['income_tax'] = $income_tax; // 个人所得税
|
||||
$result['order_inquiry_ids'] = $order_inquiry_ids; // 订单合集
|
||||
$result['order_inquiry_ids'] = $order_inquiry_id_array; // 订单合集
|
||||
|
||||
return success($result);
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
namespace App\Services;
|
||||
|
||||
use App\Amqp\Producer\AssignPharmacistProducer;
|
||||
use App\Amqp\Producer\AutoFinishInquiryDelayDirectProducer;
|
||||
use App\Constants\DoctorTitleCode;
|
||||
use App\Constants\HttpEnumCode;
|
||||
use App\Exception\BusinessException;
|
||||
@@ -1712,6 +1713,18 @@ class UserDoctorService extends BaseService
|
||||
$MessagePush = new MessagePush($user_info['user_id'],$order_inquiry['order_inquiry_id']);
|
||||
$MessagePush->finishInquiryToDoctor();
|
||||
|
||||
// 添加自动完成队列
|
||||
$data = array();
|
||||
$data['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
|
||||
|
||||
$message = new AutoFinishInquiryDelayDirectProducer($data);
|
||||
$message->setDelayMs(1000 * 60 * 1);
|
||||
$producer = $this->container->get(Producer::class);
|
||||
$res = $producer->produce($message);
|
||||
if (!$res) {
|
||||
Db::rollBack();
|
||||
return fail(HttpEnumCode::SERVER_ERROR, "订单创建失败");
|
||||
}
|
||||
Db::commit();
|
||||
} catch (\Exception $e) {
|
||||
Db::rollBack();
|
||||
|
||||
Reference in New Issue
Block a user