From 7f7fd558c1d52579bd9df351f4d8cfa2d90b9a5c Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Tue, 28 Mar 2023 09:51:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BB=B6=E8=BF=9F=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E6=9C=AA=E6=8E=A5=E8=AF=8A=E8=AE=A2=E5=8D=95=E9=98=9F?=
 =?UTF-8?q?=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Amqp/Consumer/AssignDoctorConsumer.php    | 69 +++++++------------
 ...ncelUnInquiryOrdersDelayDirectConsumer.php | 42 ++++++-----
 app/Services/InquiryService.php               | 15 ++++
 3 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/app/Amqp/Consumer/AssignDoctorConsumer.php b/app/Amqp/Consumer/AssignDoctorConsumer.php
index 6f4900e..6bc901c 100644
--- a/app/Amqp/Consumer/AssignDoctorConsumer.php
+++ b/app/Amqp/Consumer/AssignDoctorConsumer.php
@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace App\Amqp\Consumer;
 
+use App\Amqp\Producer\CancelUnpayOrdersDelayDirectProducer;
+use App\Constants\HttpEnumCode;
 use App\Model\OrderInquiry;
 use App\Model\UserDoctor;
 use App\Services\ImService;
@@ -13,6 +15,7 @@ use App\Utils\Log;
 use Extend\TencentIm\Message;
 use Extend\Wechat\WechatPay;
 use GuzzleHttp\Exception\GuzzleException;
+use Hyperf\Amqp\Producer;
 use Hyperf\Amqp\Result;
 use Hyperf\Amqp\Annotation\Consumer;
 use Hyperf\Amqp\Message\ConsumerMessage;
@@ -106,16 +109,17 @@ class AssignDoctorConsumer extends ConsumerMessage
             if ($diff_time > 300) {
                 Log::getInstance()->error("分配医生队列执行失败:超出5分钟，执行退款");
 
+                $InquiryService = new InquiryService();
+
                 // 检测问诊订单执行退款次数
                 Log::getInstance()->info("检测问诊订单执行退款次数");
-                $res = $this->checkInquiryRefundCount($order_inquiry['order_inquiry_id']);
+                $res = $InquiryService->checkInquiryRefundCount($order_inquiry['order_inquiry_id']);
                 if (!$res){
                     Db::rollBack();
                     Log::getInstance()->error("分配医生队列执行失败原因：超出最大退款次数");
                     return Result::ACK;
                 }
 
-                $InquiryService = new InquiryService();
                 $InquiryService->inquiryRefund($order_inquiry['order_inquiry_id'], "暂无医生接诊");
 
                 return Result::ACK;
@@ -137,13 +141,27 @@ class AssignDoctorConsumer extends ConsumerMessage
             }
 
             // 更改数据库
-            $data = array();
-            $data['doctor_id'] = $doctor_id;
-            $data['inquiry_status'] = 3; // 待接诊
+            $save_data = array();
+            $save_data['doctor_id'] = $doctor_id;
+            $save_data['inquiry_status'] = 3; // 待接诊
 
             $params = array();
             $params['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
-            OrderInquiry::edit($params, $data);
+            OrderInquiry::edit($params, $save_data);
+
+            // 加入未接诊取消订单延迟队列
+            $data = array();
+            $data['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
+            $message = new CancelUnpayOrdersDelayDirectProducer($data);
+            // 快速/购药-5分钟
+            $message->setDelayMs(1000 * 60 * 5);
+            $producer = $this->container->get(Producer::class);
+            $res = $producer->produce($message);
+            if (!$res) {
+                Db::rollBack();
+                Log::getInstance()->error("分配医生队列执行失败：加入未接诊取消订单延迟队列失败");
+                return Result::ACK;
+            }
 
             Db::commit();
             Log::getInstance()->error("分配医生 队列执行成功");
@@ -196,45 +214,6 @@ class AssignDoctorConsumer extends ConsumerMessage
         return Result::ACK;
     }
 
-    /**
-     * 检测问诊订单执行退款次数
-     * @param string $order_inquiry_id
-     * @return bool
-     * @throws ContainerExceptionInterface
-     * @throws NotFoundExceptionInterface
-     */
-    private function checkInquiryRefundCount(string $order_inquiry_id): bool
-    {
-        Log::getInstance()->info("检测问诊订单执行退款次数");
-
-        try {
-            $redis = $this->container->get(Redis::class);
-
-            $redis_key = "inquiryRefund" . $order_inquiry_id;
-            $redis_value = $redis->get($redis_key);
-            if(empty($redis_value)){
-                $redis->set($redis_key, 1,60 * 60 * 24 * 5);
-                return true;
-            }
-
-            // 判断退款次数
-            if ($redis_value > 3) {
-                Log::getInstance()->error("问诊订单执行退款次数过多");
-
-                // 加入短信队列,通知管理员
-
-                return false;
-            }
-
-            $redis->incr($redis_key);
-        } catch (\Exception $e) {
-            Log::getInstance()->error("检测问诊订单执行退款次数失败：抛出异常" . $e->getMessage());
-        }
-
-        Log::getInstance()->info("检测问诊订单执行退款次数成功");
-        return true;
-    }
-
     /**
      * 检测问诊订单分配次数
      * @param string $order_inquiry_id
diff --git a/app/Amqp/Consumer/CancelUnInquiryOrdersDelayDirectConsumer.php b/app/Amqp/Consumer/CancelUnInquiryOrdersDelayDirectConsumer.php
index 0330d06..d2b194c 100644
--- a/app/Amqp/Consumer/CancelUnInquiryOrdersDelayDirectConsumer.php
+++ b/app/Amqp/Consumer/CancelUnInquiryOrdersDelayDirectConsumer.php
@@ -17,6 +17,8 @@ use Hyperf\Amqp\Annotation\Consumer;
 use Hyperf\Amqp\Message\ConsumerMessage;
 use Hyperf\DbConnection\Db;
 use PhpAmqpLib\Message\AMQPMessage;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 
 /**
  * 取消未接诊问诊订单
@@ -35,6 +37,13 @@ class CancelUnInquiryOrdersDelayDirectConsumer extends ConsumerMessage
 
     protected string|array $routingKey = 'CancelUnInquiryOrders';
 
+    /**
+     * @param $data
+     * @param AMQPMessage $message
+     * @return string
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
+     */
     public function consumeMessage($data, AMQPMessage $message): string
     {
         Log::getInstance()->error("开始执行 取消未接诊问诊订单 队列：" . json_encode($data, JSON_UNESCAPED_UNICODE));
@@ -82,16 +91,16 @@ class CancelUnInquiryOrdersDelayDirectConsumer extends ConsumerMessage
             }
 
             // 取消问诊订单
-            $data = array();
-            $data['inquiry_status'] = 7;
-            $data['cancel_time'] = date("Y-m-d H:i:s", time());
-            $data['cancel_reason'] = 1; // 取消订单原因（1:医生未接诊 2:主动取消 3:无可分配医生 4:客服取消 5:支付超时）
-            $data['cancel_remarks'] = "医生未接诊"; // 取消订单备注
-            $data['updated_at'] = date("Y-m-d H:i:s", time());
+            $save_data = array();
+            $save_data['inquiry_status'] = 7;
+            $save_data['cancel_time'] = date("Y-m-d H:i:s", time());
+            $save_data['cancel_reason'] = 1; // 取消订单原因（1:医生未接诊 2:主动取消 3:无可分配医生 4:客服取消 5:支付超时）
+            $save_data['cancel_remarks'] = "医生未接诊"; // 取消订单备注
+            $save_data['updated_at'] = date("Y-m-d H:i:s", time());
 
             $params = array();
             $params['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
-            OrderInquiry::edit($params, $data);
+            OrderInquiry::edit($params, $save_data);
 
             // 恢复优惠卷
             if (!empty($order_inquiry['coupon_amount_total']) && $order_inquiry['coupon_amount_total'] > 0) {
@@ -101,40 +110,37 @@ class CancelUnInquiryOrdersDelayDirectConsumer extends ConsumerMessage
                 $order_inquiry_coupon = OrderInquiryCoupon::getOne($params);
                 if (!empty($order_inquiry_coupon)) {
                     // 恢复优惠卷
-                    $data = array();
-                    $data['user_coupon_status'] = 0;
-                    $data['coupon_use_date'] = date('Y-m-d H:i:s', time());
+                    $save_data = array();
+                    $save_data['user_coupon_status'] = 0;
+                    $save_data['coupon_use_date'] = date('Y-m-d H:i:s', time());
 
                     $params = array();
                     $params['user_coupon_id'] = $order_inquiry_coupon['user_coupon_id'];
-                    UserCoupon::edit($params, $data);
+                    UserCoupon::edit($params, $save_data);
                 }
             }
 
-            // 支付状态
+            // 订单退款
             if ($order_inquiry['inquiry_pay_status'] == 2) {
-                // 检测订单退款次数
                 // 检测问诊订单执行退款次数
                 $InquiryService = new InquiryService();
-                $res = $InquiryService->checkInquiryRefundCount($order_inquiry['order_inquiry_i d']);
+                $res = $InquiryService->checkInquiryRefundCount($order_inquiry['order_inquiry_id']);
                 if (!$res){
                     Db::rollBack();
                     Log::getInstance()->error("取消未接诊问诊订单失败：超出最大退款次数");
                     return Result::ACK;
                 }
 
-                $InquiryService->inquiryRefund($order_inquiry['order_inquiry_id'], "暂无医生接诊");
+                $InquiryService->inquiryRefund($order_inquiry['order_inquiry_id'], "医生未接诊");
 
                 return Result::ACK;
             }
-            // 订单退款
-
 
             Db::commit();
         } catch (\Exception $e) {
             Db::rollBack();
             Log::getInstance()->error("取消未接诊问诊订单失败：" . $e->getMessage());
-            return Result::ACK;
+            return Result::REQUEUE;
         }
 
 
diff --git a/app/Services/InquiryService.php b/app/Services/InquiryService.php
index d20b6a8..8e16bde 100644
--- a/app/Services/InquiryService.php
+++ b/app/Services/InquiryService.php
@@ -272,6 +272,21 @@ class InquiryService extends BaseService
                 return fail(HttpEnumCode::SERVER_ERROR, "订单创建失败");
             }
 
+            // 加入未接诊取消订单延迟队列
+            if (!empty($request_params['doctor_id']) && ($request_params['inquiry_type'] == 1 || $request_params['inquiry_type'] == 3)){
+                $data = array();
+                $data['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
+                $message = new CancelUnpayOrdersDelayDirectProducer($data);
+                // 快速/购药-5分钟
+                $message->setDelayMs(1000 * 60 * 60 * 24);
+                $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();