diff --git a/app/Amqp/Consumer/AutoCompleteInquiryDelayDirectConsumer.php b/app/Amqp/Consumer/AutoCompleteInquiryDelayDirectConsumer.php index fc8c4fe..25abaee 100644 --- a/app/Amqp/Consumer/AutoCompleteInquiryDelayDirectConsumer.php +++ b/app/Amqp/Consumer/AutoCompleteInquiryDelayDirectConsumer.php @@ -137,7 +137,7 @@ class AutoCompleteInquiryDelayDirectConsumer extends ConsumerMessage $data = array(); $data['pharmacist_audit_status'] = 2; $data['pharmacist_verify_time'] = date('Y-m-d H:i:s',time()); - $data['pharmacist_fail_reason'] = "药师过期未审核"; + $data['pharmacist_fail_reason'] = "当前问诊已结束,药师还未审核处方,系统自动驳回"; OrderPrescription::edit($params,$data); diff --git a/app/Controller/TestController.php b/app/Controller/TestController.php index 96046f5..f5263a3 100644 --- a/app/Controller/TestController.php +++ b/app/Controller/TestController.php @@ -773,8 +773,15 @@ class TestController extends AbstractController return success(); } - // 快递订阅 public function test_14(){ + $data = array(); + $data['order_inquiry_id'] = "505411502226542593"; + $message = new AssignDoctorProducer($data); + $producer = ApplicationContext::getContainer()->get(Producer::class); + $result = $producer->produce($message); + if (!$result) { + dump(111); + } } } \ No newline at end of file diff --git a/app/Services/PatientOrderService.php b/app/Services/PatientOrderService.php index cd08111..d5cac18 100644 --- a/app/Services/PatientOrderService.php +++ b/app/Services/PatientOrderService.php @@ -777,8 +777,11 @@ class PatientOrderService extends BaseService return fail(HttpEnumCode::HTTP_ERROR, "支付失败"); } + $generator = $this->container->get(IdGeneratorInterface::class); + // 修改支付状态 $data = array(); + $data['inquiry_pay_channel'] = 3; // 支付渠道(1:小程序支付 2:微信扫码支付 3:模拟支付) $data['inquiry_pay_status'] = 2; if ($order_inquiry['inquiry_type'] == 1 || $order_inquiry['inquiry_type'] == 3){ // 专家-公益 @@ -788,6 +791,8 @@ class PatientOrderService extends BaseService $data['inquiry_status'] = 2;// 2:待分配 } + $data['escrow_trade_no'] = "GD" . $generator->generate(); // 第三方支付流水号 + $data['pay_time'] = date('Y-m-d H:i:s',time());// 支付时间 $data['updated_at'] = date('Y-m-d H:i:s',time()); $params = array(); $params['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];