diff --git a/app/Amqp/Consumer/CancelUnInquiryOrdersDelayDirectConsumer.php b/app/Amqp/Consumer/CancelUnInquiryOrdersDelayDirectConsumer.php index 50fb8f9..3408f1e 100644 --- a/app/Amqp/Consumer/CancelUnInquiryOrdersDelayDirectConsumer.php +++ b/app/Amqp/Consumer/CancelUnInquiryOrdersDelayDirectConsumer.php @@ -149,6 +149,18 @@ class CancelUnInquiryOrdersDelayDirectConsumer extends ConsumerMessage $MessagePush = new MessagePush($order_inquiry['user_id'],$order_inquiry['order_inquiry_id']); $MessagePush->patientNoInquiry(); + if (!empty($order_inquiry['coupon_amount_total']) && $order_inquiry['coupon_amount_total'] > 0) { + // 获取用户优惠卷信息 + $params = array(); + $params['order_inquiry_id'] = $order_inquiry['order_inquiry_id']; + $order_inquiry_coupon = OrderInquiryCoupon::getOne($params); + if (!empty($order_inquiry_coupon)){ + // 发送站内消息-优惠卷退还 + $MessagePush = new MessagePush($order_inquiry['user_id'], $order_inquiry['order_inquiry_id']); + $MessagePush->patientRefundCoupon($order_inquiry_coupon['coupon_name']); + } + } + Log::getInstance()->info("取消未接诊问诊订单成功,发送消息成功"); } catch (\Exception $e) { // 验证失败 diff --git a/app/Controller/TestController.php b/app/Controller/TestController.php index c103957..6293531 100644 --- a/app/Controller/TestController.php +++ b/app/Controller/TestController.php @@ -42,7 +42,6 @@ use Hyperf\DbConnection\Db; use Hyperf\Redis\Redis; use Hyperf\Utils\ApplicationContext; use Hyperf\Utils\Coroutine\Concurrent; -use Imagick; use Intervention\Image\ImageManager; use Spatie\PdfToImage\Pdf; use Swoole\Coroutine; diff --git a/app/Services/InquiryService.php b/app/Services/InquiryService.php index 4b3e18e..c39330c 100644 --- a/app/Services/InquiryService.php +++ b/app/Services/InquiryService.php @@ -1230,6 +1230,16 @@ class InquiryService extends BaseService if (!empty($order_inquiry['coupon_amount_total']) && $order_inquiry['coupon_amount_total'] > 0) { $InquiryService = new InquiryService(); $InquiryService->returnInquiryCoupon($order_inquiry['order_inquiry_id'], $order_inquiry['user_id']); + + // 获取用户优惠卷信息 + $params = array(); + $params['order_inquiry_id'] = $order_inquiry['order_inquiry_id']; + $order_inquiry_coupon = OrderInquiryCoupon::getOne($params); + if (!empty($order_inquiry_coupon)){ + // 发送站内消息-优惠卷退还 + $MessagePush = new MessagePush($order_inquiry['user_id'], $order_inquiry['order_inquiry_id']); + $MessagePush->patientRefundCoupon($order_inquiry_coupon['coupon_name']); + } } return $result; diff --git a/app/Services/PatientOrderService.php b/app/Services/PatientOrderService.php index b404033..310f394 100644 --- a/app/Services/PatientOrderService.php +++ b/app/Services/PatientOrderService.php @@ -9,6 +9,7 @@ use App\Constants\HttpEnumCode; use App\Model\Hospital; use App\Model\OrderInquiry; use App\Model\OrderInquiryCase; +use App\Model\OrderInquiryCoupon; use App\Model\OrderPrescription; use App\Model\OrderPrescriptionFile; use App\Model\OrderPrescriptionProduct; @@ -330,6 +331,16 @@ class PatientOrderService extends BaseService $inquiryService->inquiryRefund($order_inquiry['order_inquiry_id'], "取消问诊"); } + // 删除锁 + $redis->del($redis_key); + + Db::commit(); + } catch (\Exception $e) { + Db::rollBack(); + return fail(HttpEnumCode::HTTP_ERROR, $e->getMessage()); + } + + try { if (!empty($order_inquiry['doctor_id'])){ // 获取医生数据 $params = array(); @@ -343,15 +354,19 @@ class PatientOrderService extends BaseService // 推送医生-患者取消问诊 $MessagePush = new MessagePush($user_doctor['user_id'],$order_inquiry['order_inquiry_id']); $MessagePush->patientCancelInquiryToDoctor(); + + // 获取用户优惠卷信息 + $params = array(); + $params['order_inquiry_id'] = $order_inquiry['order_inquiry_id']; + $order_inquiry_coupon = OrderInquiryCoupon::getOne($params); + if (!empty($order_inquiry_coupon)){ + // 发送站内消息-优惠卷退还 + $MessagePush = new MessagePush($order_inquiry['user_id'], $order_inquiry['order_inquiry_id']); + $MessagePush->patientRefundCoupon($order_inquiry_coupon['coupon_name']); + } } - - // 删除锁 - $redis->del($redis_key); - - Db::commit(); - } catch (\Exception $e) { - Db::rollBack(); - return fail(HttpEnumCode::HTTP_ERROR, $e->getMessage()); + }catch(\Exception $e){ + return success(); } return success();