增加了订单主表,修改了所有订单相关,支付相关代码
This commit is contained in:
@@ -15,8 +15,10 @@ use App\Model\UserDoctor;
|
||||
use App\Services\ImService;
|
||||
use App\Services\InquiryService;
|
||||
use App\Services\MessagePush;
|
||||
use App\Services\OrderService;
|
||||
use App\Services\UserDoctorService;
|
||||
use App\Utils\Log;
|
||||
use App\Utils\Utils;
|
||||
use Hyperf\Amqp\Message\ConsumerDelayedMessageTrait;
|
||||
use Hyperf\Amqp\Message\ProducerDelayedMessageTrait;
|
||||
use Hyperf\Amqp\Message\Type;
|
||||
@@ -49,14 +51,14 @@ class AssignDoctorDelayDirectConsumer extends ConsumerMessage
|
||||
|
||||
public function consumeMessage($data, AMQPMessage $message): string
|
||||
{
|
||||
Log::getInstance('queue-AssignDoctor')->info("开始:" . json_encode($data, JSON_UNESCAPED_UNICODE));
|
||||
Log::getInstance('queue-AssignDoctor')->info(json_encode($data, JSON_UNESCAPED_UNICODE));
|
||||
|
||||
// 获取订单数据
|
||||
$params = array();
|
||||
$params['order_inquiry_id'] = $data['order_inquiry_id'];
|
||||
$order_inquiry = OrderInquiry::getOne($params);
|
||||
if (empty($order_inquiry)) {
|
||||
Log::getInstance('queue-AssignDoctor')->error("错误:未查询到对应订单数据");
|
||||
Log::getInstance('queue-AssignDoctor')->error("未查询到对应订单数据");
|
||||
return Result::DROP;// 销毁
|
||||
}
|
||||
|
||||
@@ -65,14 +67,14 @@ class AssignDoctorDelayDirectConsumer extends ConsumerMessage
|
||||
$params['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
|
||||
$order_inquiry_case = OrderInquiryCase::getOne($params);
|
||||
if (empty($order_inquiry_case)){
|
||||
Log::getInstance('queue-AssignDoctor')->error("错误:患者病例错误");
|
||||
Log::getInstance('queue-AssignDoctor')->error("患者病例错误");
|
||||
return Result::DROP;// 销毁
|
||||
}
|
||||
|
||||
// 检测订单状态
|
||||
$res = $this->checkInquiryStatus($order_inquiry);
|
||||
if (!$res){
|
||||
Log::getInstance('queue-AssignDoctor')->error("错误:订单状态错误");
|
||||
Log::getInstance('queue-AssignDoctor')->error("订单状态错误");
|
||||
return Result::DROP;// 销毁
|
||||
}
|
||||
|
||||
@@ -80,7 +82,7 @@ class AssignDoctorDelayDirectConsumer extends ConsumerMessage
|
||||
$pay_time = strtotime($order_inquiry['pay_time']);
|
||||
$diff_time = time() - $pay_time;
|
||||
if ($diff_time < 0) {
|
||||
Log::getInstance('queue-AssignDoctor')->error("错误:支付时间错误");
|
||||
Log::getInstance('queue-AssignDoctor')->error("支付时间错误");
|
||||
return Result::DROP;// 销毁
|
||||
}
|
||||
|
||||
@@ -91,23 +93,25 @@ class AssignDoctorDelayDirectConsumer extends ConsumerMessage
|
||||
$is_system_time_pass = $inquiryService->checkSystemInquiryTime($order_inquiry['inquiry_type']);
|
||||
if (!$is_system_time_pass && $order_inquiry['inquiry_type'] == 4){
|
||||
// 非坐班时间
|
||||
Log::getInstance("queue-AssignDoctor")->info("信息:非坐班时间,执行退款");
|
||||
Log::getInstance("queue-AssignDoctor")->info("非坐班时间,执行退款");
|
||||
|
||||
$InquiryService = new InquiryService();
|
||||
|
||||
// 检测问诊订单执行退款次数
|
||||
Log::getInstance("queue-AssignDoctor")->info("信息:检测执行退款次数");
|
||||
$res = $InquiryService->checkInquiryRefundCount($order_inquiry['order_inquiry_id']);
|
||||
if (!$res){
|
||||
// 检测执行次数
|
||||
$Utils = new Utils();
|
||||
$redis_key = "inquiryRefund" . $order_inquiry['inquiry_no'];
|
||||
$res = $Utils->checkHandleNumber($redis_key);
|
||||
if (!$res) {
|
||||
Db::rollBack();
|
||||
Log::getInstance("queue-AssignDoctor")->error("错误:超出最大退款次数");
|
||||
Log::getInstance("queue-CancelUnInquiryOrders")->error("超出最大执行次数或检测错误");
|
||||
return Result::ACK;
|
||||
}
|
||||
|
||||
Log::getInstance("queue-AssignDoctor")->info("信息:订单退款");
|
||||
$InquiryService->inquiryRefund($order_inquiry['order_inquiry_id'], "无可分配医生");
|
||||
|
||||
Log::getInstance("queue-AssignDoctor")->info("信息:取消问诊订单");
|
||||
$OrderService = new OrderService();
|
||||
$OrderService->orderRefund($order_inquiry['inquiry_no'], "无可分配医生");
|
||||
|
||||
Log::getInstance("queue-AssignDoctor")->info("取消问诊订单");
|
||||
|
||||
$save_data = array();
|
||||
$save_data['inquiry_status'] = 7;
|
||||
$save_data['cancel_time'] = date("Y-m-d H:i:s", time());
|
||||
@@ -119,7 +123,7 @@ class AssignDoctorDelayDirectConsumer extends ConsumerMessage
|
||||
$params['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
|
||||
OrderInquiry::edit($params, $save_data);
|
||||
|
||||
Log::getInstance("queue-AssignDoctor")->info("成功:已退款");
|
||||
Log::getInstance("queue-AssignDoctor")->info("已退款");
|
||||
|
||||
Db::commit();
|
||||
|
||||
@@ -128,7 +132,7 @@ class AssignDoctorDelayDirectConsumer extends ConsumerMessage
|
||||
$MessagePush = new MessagePush($order_inquiry['user_id'],$order_inquiry['order_inquiry_id']);
|
||||
$MessagePush->assignDoctorFail();
|
||||
}catch (\Exception $e){
|
||||
Log::getInstance("queue-AssignDoctor")->error("错误:" . $e->getMessage());
|
||||
Log::getInstance("queue-AssignDoctor")->error( $e->getMessage());
|
||||
}
|
||||
|
||||
return Result::ACK;
|
||||
@@ -136,23 +140,25 @@ class AssignDoctorDelayDirectConsumer extends ConsumerMessage
|
||||
|
||||
// 检测分配时间
|
||||
if ($diff_time > 600) {
|
||||
Log::getInstance("queue-AssignDoctor")->info("信息:超出10分钟,执行退款");
|
||||
Log::getInstance("queue-AssignDoctor")->info("超出10分钟,执行退款");
|
||||
|
||||
$InquiryService = new InquiryService();
|
||||
|
||||
// 检测问诊订单执行退款次数
|
||||
Log::getInstance("queue-AssignDoctor")->info("信息:检测执行退款次数");
|
||||
$res = $InquiryService->checkInquiryRefundCount($order_inquiry['order_inquiry_id']);
|
||||
if (!$res){
|
||||
// 检测执行次数
|
||||
$Utils = new Utils();
|
||||
$redis_key = "inquiryRefund" . $order_inquiry['inquiry_no'];
|
||||
$res = $Utils->checkHandleNumber($redis_key);
|
||||
if (!$res) {
|
||||
Db::rollBack();
|
||||
Log::getInstance("queue-AssignDoctor")->error("错误:超出最大退款次数");
|
||||
Log::getInstance("queue-CancelUnInquiryOrders")->error("超出最大执行次数或检测错误");
|
||||
return Result::ACK;
|
||||
}
|
||||
|
||||
Log::getInstance("queue-AssignDoctor")->info("信息:订单退款");
|
||||
$InquiryService->inquiryRefund($order_inquiry['order_inquiry_id'], "未分配到合适的医生");
|
||||
Log::getInstance("queue-AssignDoctor")->info("订单退款");
|
||||
|
||||
$OrderService = new OrderService();
|
||||
$OrderService->orderRefund($order_inquiry['inquiry_no'], "未分配到合适的医生");
|
||||
|
||||
Log::getInstance("queue-AssignDoctor")->info("取消问诊订单");
|
||||
|
||||
Log::getInstance("queue-AssignDoctor")->info("信息:取消问诊订单");
|
||||
$save_data = array();
|
||||
$save_data['inquiry_status'] = 7;
|
||||
$save_data['cancel_time'] = date("Y-m-d H:i:s", time());
|
||||
@@ -164,7 +170,7 @@ class AssignDoctorDelayDirectConsumer extends ConsumerMessage
|
||||
$params['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
|
||||
OrderInquiry::edit($params, $save_data);
|
||||
|
||||
Log::getInstance("queue-AssignDoctor")->info("成功:已退款");
|
||||
Log::getInstance("queue-AssignDoctor")->info("已退款");
|
||||
|
||||
Db::commit();
|
||||
|
||||
@@ -173,7 +179,7 @@ class AssignDoctorDelayDirectConsumer extends ConsumerMessage
|
||||
$MessagePush = new MessagePush($order_inquiry['user_id'],$order_inquiry['order_inquiry_id']);
|
||||
$MessagePush->assignDoctorFail();
|
||||
}catch (\Exception $e){
|
||||
Log::getInstance("queue-AssignDoctor")->error("错误:" . $e->getMessage());
|
||||
Log::getInstance("queue-AssignDoctor")->error($e->getMessage());
|
||||
}
|
||||
|
||||
return Result::ACK;
|
||||
@@ -183,9 +189,9 @@ class AssignDoctorDelayDirectConsumer extends ConsumerMessage
|
||||
$res = $this->checkHandleNumber($data['order_inquiry_id']);
|
||||
if (!$res) {
|
||||
// 超出执行次数后,不再进行分配,按照结束分配时间,重新加入队列。
|
||||
Log::getInstance("queue-AssignDoctor")->info("信息:超出最大执行次数或检测错误");
|
||||
Log::getInstance("queue-AssignDoctor")->info("超出最大执行次数或检测错误");
|
||||
|
||||
Log::getInstance("queue-AssignDoctor")->info("信息:重新加入延迟队列");
|
||||
Log::getInstance("queue-AssignDoctor")->info("重新加入延迟队列");
|
||||
|
||||
$queue_data = array();
|
||||
$queue_data['order_inquiry_id'] = $data['order_inquiry_id'];
|
||||
@@ -199,7 +205,7 @@ class AssignDoctorDelayDirectConsumer extends ConsumerMessage
|
||||
$res = $producer->produce($message);
|
||||
if (!$res) {
|
||||
Db::rollBack();
|
||||
Log::getInstance("queue-AssignDoctor")->error("错误:重新加入分配医生队列失败,重回队列");
|
||||
Log::getInstance("queue-AssignDoctor")->error("重新加入分配医生队列失败,重回队列");
|
||||
return Result::REQUEUE;
|
||||
}
|
||||
|
||||
@@ -208,14 +214,14 @@ class AssignDoctorDelayDirectConsumer extends ConsumerMessage
|
||||
return Result::ACK;
|
||||
}
|
||||
|
||||
Log::getInstance("queue-AssignDoctor")->info("信息:分配医生");
|
||||
Log::getInstance("queue-AssignDoctor")->info("分配医生");
|
||||
$UserDoctorService = new UserDoctorService();
|
||||
$doctor_id = $UserDoctorService->getInquiryAssignDoctor($order_inquiry['inquiry_type'],$order_inquiry['patient_id'],$is_system_time_pass);
|
||||
if (empty($doctor_id)){
|
||||
Log::getInstance("queue-AssignDoctor")->info("信息:无合适医生");
|
||||
Log::getInstance("queue-AssignDoctor")->info("无合适医生");
|
||||
Db::rollBack();
|
||||
|
||||
Log::getInstance("queue-AssignDoctor")->info("信息:重新加入延迟队列");
|
||||
Log::getInstance("queue-AssignDoctor")->info("重新加入延迟队列");
|
||||
|
||||
$queue_data = array();
|
||||
$queue_data['order_inquiry_id'] = $data['order_inquiry_id'];
|
||||
@@ -226,7 +232,7 @@ class AssignDoctorDelayDirectConsumer extends ConsumerMessage
|
||||
$res = $producer->produce($message);
|
||||
if (!$res) {
|
||||
Db::rollBack();
|
||||
Log::getInstance("queue-AssignDoctor")->error("错误:重新加入分配医生队列失败,重回队列");
|
||||
Log::getInstance("queue-AssignDoctor")->error("重新加入分配医生队列失败,重回队列");
|
||||
return Result::REQUEUE;
|
||||
}
|
||||
|
||||
@@ -253,7 +259,7 @@ class AssignDoctorDelayDirectConsumer extends ConsumerMessage
|
||||
$res = $producer->produce($message);
|
||||
if (!$res) {
|
||||
Db::rollBack();
|
||||
Log::getInstance("queue-AssignDoctor")->error("错误:加入未接诊取消订单延迟队列失败");
|
||||
Log::getInstance("queue-AssignDoctor")->error("加入未接诊取消订单延迟队列失败");
|
||||
return Result::REQUEUE;
|
||||
}
|
||||
|
||||
@@ -261,7 +267,7 @@ class AssignDoctorDelayDirectConsumer extends ConsumerMessage
|
||||
Log::getInstance("queue-AssignDoctor")->info("成功");
|
||||
} catch (\Throwable $e) {
|
||||
Db::rollBack();
|
||||
Log::getInstance("queue-AssignDoctor")->error("失败:" . $e->getMessage());
|
||||
Log::getInstance("queue-AssignDoctor")->error($e->getMessage());
|
||||
return Result::REQUEUE; // 重回队列
|
||||
}
|
||||
|
||||
@@ -272,7 +278,7 @@ class AssignDoctorDelayDirectConsumer extends ConsumerMessage
|
||||
$params['doctor_id'] = $doctor_id;
|
||||
$user_doctor = UserDoctor::getOne($params);
|
||||
if (empty($user_doctor)) {
|
||||
Log::getInstance("queue-AssignDoctor")->error("错误:医生数据错误");
|
||||
Log::getInstance("queue-AssignDoctor")->error("医生数据错误");
|
||||
return Result::ACK;
|
||||
}
|
||||
|
||||
@@ -296,7 +302,7 @@ class AssignDoctorDelayDirectConsumer extends ConsumerMessage
|
||||
$producer = $this->container->get(Producer::class);
|
||||
$producer->produce($message);
|
||||
}catch (\Throwable $e){
|
||||
Log::getInstance("queue-AssignDoctor")->error("发送消息异常错误:" . $e->getMessage());
|
||||
Log::getInstance("queue-AssignDoctor")->error($e->getMessage());
|
||||
return Result::ACK;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user