From d0409088a6b17e500ae3244e9b0fdd576d595d33 Mon Sep 17 00:00:00 2001 From: ctexthuang Date: Mon, 24 Feb 2025 15:08:44 +0800 Subject: [PATCH] feat : refund --- app/Amqp/Consumer/RefundOrderConsumer.php | 3 --- app/Service/Amqp/Refund/RefundService.php | 10 +++++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/Amqp/Consumer/RefundOrderConsumer.php b/app/Amqp/Consumer/RefundOrderConsumer.php index cb2660a..6802cc8 100644 --- a/app/Amqp/Consumer/RefundOrderConsumer.php +++ b/app/Amqp/Consumer/RefundOrderConsumer.php @@ -4,11 +4,8 @@ declare(strict_types=1); namespace App\Amqp\Consumer; -use App\Constants\Common\OrderCode; use App\Lib\Log; use App\Model\Order; -use App\Service\Amqp\Refund\GoodOrderAllRefundService; -use App\Service\Amqp\Refund\RefundFactory; use App\Service\Amqp\Refund\RefundService; use App\Service\ServiceTrait\Api\OrderTrait; use Exception; diff --git a/app/Service/Amqp/Refund/RefundService.php b/app/Service/Amqp/Refund/RefundService.php index 383da69..a50affc 100644 --- a/app/Service/Amqp/Refund/RefundService.php +++ b/app/Service/Amqp/Refund/RefundService.php @@ -184,7 +184,7 @@ class RefundService ]); } - protected function refund() + protected function refund(): void { $rechargeService = match ($this->refundInfo->refund_type) { @@ -193,13 +193,13 @@ class RefundService }; $rechargeService->setConfig(); - $rechargeService->setNotify(); + $rechargeService->setRefundNotify(); - $payData = $rechargeService->pay( + $rechargeService->refund( + $this->refundAmount, (float)$this->orderInfo->actual_price, - $this->request->input('body','订单支付'), $this->orderInfo->order_no, - $this->userId + $this->refundInfo->refund_no, ); }