From 113f9e34a192bb1f5617ea02abead7d727fbd414 Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Thu, 4 May 2023 09:37:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=98=E6=83=A0=E5=8D=B7?= =?UTF-8?q?=E5=8D=B3=E5=B0=86=E8=BF=87=E6=9C=9F=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Consumer/AssignPharmacistConsumer.php | 2 +- ...CouponExpiredNoticeDelayDirectConsumer.php | 99 +++++++++++++++++++ ...CouponExpiredNoticeDelayDirectProducer.php | 30 ++++++ app/Services/CouponService.php | 77 +++++++++------ app/Services/MessagePush.php | 7 +- 5 files changed, 181 insertions(+), 34 deletions(-) create mode 100644 app/Amqp/Consumer/UserCouponExpiredNoticeDelayDirectConsumer.php create mode 100644 app/Amqp/Producer/UserCouponExpiredNoticeDelayDirectProducer.php diff --git a/app/Amqp/Consumer/AssignPharmacistConsumer.php b/app/Amqp/Consumer/AssignPharmacistConsumer.php index 960fe46..1425b9e 100644 --- a/app/Amqp/Consumer/AssignPharmacistConsumer.php +++ b/app/Amqp/Consumer/AssignPharmacistConsumer.php @@ -103,7 +103,7 @@ class AssignPharmacistConsumer extends ConsumerMessage Log::getInstance()->error("分配药师队列执行失败原因：" . $e->getMessage()); // 分配失败，按照驳回处理 - $this->reject($data['order_prescription_id'], $user_doctor['user_id'], $order_prescription['order_inquiry_id']); + $this->reject($data['order_prescription_id'], $user_doctor['user_id'],$user_patient['user_id'], $order_prescription['order_inquiry_id']); return Result::DROP; // 重回队列 } diff --git a/app/Amqp/Consumer/UserCouponExpiredNoticeDelayDirectConsumer.php b/app/Amqp/Consumer/UserCouponExpiredNoticeDelayDirectConsumer.php new file mode 100644 index 0000000..d3ef4c7 --- /dev/null +++ b/app/Amqp/Consumer/UserCouponExpiredNoticeDelayDirectConsumer.php @@ -0,0 +1,99 @@ +error("开始：" . json_encode($data, JSON_UNESCAPED_UNICODE)); + + // 检测参数 + if (!isset($data['user_coupon_id'])){ + Db::rollBack(); + Log::getInstance("queue-UserCouponExpiredNotice")->error("错误：入参错误"); + return Result::DROP; + } + + // 获取优惠卷数据 + $params = array(); + $params['user_coupon_id'] = $data['user_coupon_id']; + $user_coupon = UserCoupon::getOne($params); + if (empty($user_coupon)){ + Log::getInstance("queue-UserCouponExpiredNotice")->error("错误：无优惠卷数据"); + return Result::DROP; + } + + // 检测优惠卷是否被使用 + if ($user_coupon['user_coupon_status'] == 1){ + Log::getInstance("queue-UserCouponExpiredNotice")->info("结束：优惠卷已被使用，无需处理"); + return Result::DROP; + } + + // 检测优惠卷是否已执行过期处理 + if ($user_coupon['user_coupon_status'] == 3){ + Log::getInstance("queue-UserCouponExpiredNotice")->info("结束：优惠卷已执行过期处理，无需处理"); + return Result::DROP; + } + + // 检测优惠卷过期时间 + $valid_end_time = strtotime($user_coupon['valid_end_time']); + + if ($valid_end_time <= time()){ + // 已过期，无需处理 + Log::getInstance("queue-UserCouponExpiredNotice")->info("结束：优惠卷过期，无需处理"); + return Result::DROP; + } + + $params = array(); + $params['coupon_id'] = $user_coupon['coupon_id']; + $coupon = Coupon::getOne($params); + if (empty($coupon)){ + Log::getInstance("queue-UserCouponExpiredNotice")->error("错误：无优惠卷数据"); + return Result::DROP; + } + + try { + // 患者-优惠卷即将过期 + $MessagePush = new MessagePush($user_coupon['user_id']); + $MessagePush->patientExpireCoupon($coupon['coupon_name']); + + }catch (\Exception $e){ + Log::getInstance("queue-UserCouponExpiredNotice")->error("错误：" . $e->getMessage()); + return Result::DROP; + } + + + return Result::ACK; + } +} diff --git a/app/Amqp/Producer/UserCouponExpiredNoticeDelayDirectProducer.php b/app/Amqp/Producer/UserCouponExpiredNoticeDelayDirectProducer.php new file mode 100644 index 0000000..4887c97 --- /dev/null +++ b/app/Amqp/Producer/UserCouponExpiredNoticeDelayDirectProducer.php @@ -0,0 +1,30 @@ +payload = $data; + } +} diff --git a/app/Services/CouponService.php b/app/Services/CouponService.php index 3a57461..df108a6 100644 --- a/app/Services/CouponService.php +++ b/app/Services/CouponService.php @@ -4,6 +4,7 @@ namespace App\Services; use App\Amqp\Producer\AutoCompleteInquiryDelayDirectProducer; use App\Amqp\Producer\UserCouponExpiredDelayDirectProducer; +use App\Amqp\Producer\UserCouponExpiredNoticeDelayDirectProducer; use App\Constants\HttpEnumCode; use App\Model\Coupon; use App\Model\Popup; @@ -29,17 +30,17 @@ class CouponService extends BaseService public function getUserCouponStatusList(string|int $user_id, array $inquiry_type, int $user_coupon_status): array { $params = array(); - $params[] = ['user_id','=',$user_id]; - $params[] = ['user_coupon_status','=',$user_coupon_status];// 状态（0:未使用 1:已使用 3:已过期） + $params[] = ['user_id', '=', $user_id]; + $params[] = ['user_coupon_status', '=', $user_coupon_status];// 状态（0:未使用 1:已使用 3:已过期） $coupon_params = array(); - $coupon_params[] = ['coupon_client','=',1]; - $coupon_params[] = ['coupon_status','=',1]; // 状态（1:正常 2:强制失效 3:结束 4:删除） + $coupon_params[] = ['coupon_client', '=', 1]; + $coupon_params[] = ['coupon_status', '=', 1]; // 状态（1:正常 2:强制失效 3:结束 4:删除） $application_scope_params = $inquiry_type; // 适用范围（1:全部 2:快速问诊 3:专家问诊 4:公益问诊 5:问诊购药） - $user_coupon = UserCoupon::getWithCouponList($params,$coupon_params,$application_scope_params); - if (empty($user_coupon)){ + $user_coupon = UserCoupon::getWithCouponList($params, $coupon_params, $application_scope_params); + if (empty($user_coupon)) { return array(); } @@ -59,19 +60,19 @@ class CouponService extends BaseService $inquiry_type = $inquiry_type + 1; $params = array(); - $params[] = ['user_id','=',$user_id]; - $params[] = ['user_coupon_status','=',0];// 状态（0:未使用 1:已使用 3:已过期） - $params[] = ['valid_start_time','<',date('Y-m-d H:i:s',time())]; // 有效使用时间 - $params[] = ['valid_end_time','>',date('Y-m-d H:i:s',time())]; // 过期使用时间 + $params[] = ['user_id', '=', $user_id]; + $params[] = ['user_coupon_status', '=', 0];// 状态（0:未使用 1:已使用 3:已过期） + $params[] = ['valid_start_time', '<', date('Y-m-d H:i:s', time())]; // 有效使用时间 + $params[] = ['valid_end_time', '>', date('Y-m-d H:i:s', time())]; // 过期使用时间 $coupon_params = array(); - $coupon_params[] = ['coupon_client','=',$coupon_client]; - $coupon_params[] = ['coupon_status','=',1]; // 状态（1:正常 2:强制失效 3:结束 4:删除） + $coupon_params[] = ['coupon_client', '=', $coupon_client]; + $coupon_params[] = ['coupon_status', '=', 1]; // 状态（1:正常 2:强制失效 3:结束 4:删除） - $application_scope_params = [1,$inquiry_type]; // 适用范围（1:全部 2:快速问诊 3:专家问诊 4:公益问诊 5:问诊购药） + $application_scope_params = [1, $inquiry_type]; // 适用范围（1:全部 2:快速问诊 3:专家问诊 4:公益问诊 5:问诊购药） - $user_coupon = UserCoupon::getDateWithCouponOne($params,$coupon_params,$application_scope_params); - if (empty($user_coupon)){ + $user_coupon = UserCoupon::getDateWithCouponOne($params, $coupon_params, $application_scope_params); + if (empty($user_coupon)) { return array(); } @@ -88,7 +89,7 @@ class CouponService extends BaseService * @throws ContainerExceptionInterface * @throws NotFoundExceptionInterface */ - public function DistributeCoupon(int $distribution_object,string $user_id,string $patient_id,int $coupon_client = 1): bool + public function DistributeCoupon(int $distribution_object, string $user_id, string $patient_id, int $coupon_client = 1): bool { $params = array(); $params['coupon_client'] = $coupon_client; @@ -96,13 +97,13 @@ class CouponService extends BaseService $params['distribution_object'] = $distribution_object; // 发放对象（1:新注册用户 2:会员 3:近期消费 4:近期购药） $coupon = Coupon::getList($params); - if (empty($coupon)){ + if (empty($coupon)) { return true; } - foreach ($coupon as $key => $value){ + foreach ($coupon as $key => $value) { // 判断发放数量 - if ($value['coupon_count'] == $value['coupon_take_count']){ + if ($value['coupon_count'] == $value['coupon_take_count']) { continue; } @@ -112,20 +113,20 @@ class CouponService extends BaseService $data['patient_id'] = $patient_id; $data['coupon_id'] = $value['coupon_id']; - if ($value['valid_type'] == 1){ + if ($value['valid_type'] == 1) { // 有效类型（1:绝对时效，xxx-xxx时间段有效 2:相对时效 n天内有效） $data['valid_start_time'] = $value['valid_start_time']; // 有效使用时间 $data['valid_end_time'] = $value['valid_end_time']; // 过期使用时间 - }elseif ($value['valid_type'] == 2){ + } elseif ($value['valid_type'] == 2) { // 有效类型（1:绝对时效，xxx-xxx时间段有效 2:相对时效 n天内有效） - $data['valid_start_time'] = date('Y-m-d H:i:s',time()); // 有效使用时间 - $data['valid_end_time'] = date("Y-m-d H:i:s",strtotime($value['valid_days'] . " day")); - }else{ + $data['valid_start_time'] = date('Y-m-d H:i:s', time()); // 有效使用时间 + $data['valid_end_time'] = date("Y-m-d H:i:s", strtotime($value['valid_days'] . " day")); + } else { return false; } $user_coupon = UserCoupon::addUserCoupon($data); - if (empty($user_coupon)){ + if (empty($user_coupon)) { return false; } @@ -145,14 +146,14 @@ class CouponService extends BaseService 'valid_start_time' => $value['valid_start_time'], // 开始使用时间 'valid_end_time' => $value['valid_end_time'], // 结束使用时间 ]; - $data['popup_content'] = json_encode($popup_content,JSON_UNESCAPED_UNICODE); + $data['popup_content'] = json_encode($popup_content, JSON_UNESCAPED_UNICODE); $popup = Popup::addPopup($data); - if (empty($popup)){ + if (empty($popup)) { return false; } // 添加用户优惠卷自动过期队列 - // 添加自动完成队列 + // 添加优惠卷过期队列 $valid_end_time = strtotime($user_coupon->valid_end_time); $data = array(); @@ -167,11 +168,27 @@ class CouponService extends BaseService return false; } + // 添加优惠卷即将过期提醒队列 + if ($time > 60 * 60 * 24 * 2) { + $time = 60 * 60 * 24 * 2; + } else { + if ($time > 60 * 60 * 5){ + $time = $time - 60 * 60 * 5; + } + } + $message = new UserCouponExpiredNoticeDelayDirectProducer($data); + $message->setDelayMs(1000 * $time); + $producer = $this->container->get(Producer::class); + $res = $producer->produce($message); + if (!$res) { + return false; + } + try { - // 患者-发送通知消息-优惠卷发放 + // 患者-优惠卷发放 $MessagePush = new MessagePush($user_id); $MessagePush->patientDistributeCoupon($value['coupon_name']); - }catch (\Exception $e){ + } catch (\Exception $e) { // 不做处理 Log::getInstance()->error($e->getMessage()); } diff --git a/app/Services/MessagePush.php b/app/Services/MessagePush.php index 11f18bd..00bed91 100644 --- a/app/Services/MessagePush.php +++ b/app/Services/MessagePush.php @@ -635,13 +635,14 @@ class MessagePush extends BaseService } /** - * 患者-优惠劵过期 + * 患者-优惠劵即将过期 * 站内 + * @param string $coupon_name * @return void * @throws ContainerExceptionInterface * @throws NotFoundExceptionInterface */ - public function patientExpireCoupon(): void + public function patientExpireCoupon(string $coupon_name): void { try { $data = array(); @@ -650,7 +651,7 @@ class MessagePush extends BaseService $data['notice_system_type'] = 2; // 系统消息类型（患者端系统消息存在 1:服务消息 2:福利消息 3:退款消息 4:物流消息） $data['from_name'] = "肝胆小秘书"; $data['notice_brief_title'] = "您有一张优惠劵即将过期，点击查看详情。"; - $data['notice_title'] = "【优惠劵名称】即将过期"; + $data['notice_title'] = "【{$coupon_name}】即将过期"; $data['notice_content'] = "您有一张优惠劵即将过期，点击查看详情！"; $data['link_type'] = 7;