From 1473a1a5555b8d5dcf884f8e42761ba165d68126 Mon Sep 17 00:00:00 2001
From: tk <szdot@live.com>
Date: Fri, 28 Jun 2024 12:27:17 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=09=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=20=E3=80=90=E4=B8=BB=09=E9=A2=98=E3=80=91=EF=BC=9A=20?=
 =?UTF-8?q?=E3=80=90=E6=8F=8F=09=E8=BF=B0=E3=80=91=EF=BC=9A=20=09[?=
 =?UTF-8?q?=E5=8E=9F=E5=9B=A0]=EF=BC=9A=20=09[=E8=BF=87=E7=A8=8B]=EF=BC=9A?=
 =?UTF-8?q?=20=09[=E5=BD=B1=E5=93=8D]=EF=BC=9A=20=E3=80=90=E7=BB=93=09?=
 =?UTF-8?q?=E6=9D=9F=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# 类型 包含:
# feat：新功能（feature）
# fix：修补bug
# docs：文档（documentation）
# style： 格式（不影响代码运行的变动）
# refactor：重构（即不是新增功能，也不是修改bug的代码变动）
# test：增加测试
# chore：构建过程或辅助工具的变动
---
 FlyCube/MpApi/Controller/PayController.class.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/FlyCube/MpApi/Controller/PayController.class.php b/FlyCube/MpApi/Controller/PayController.class.php
index c2d0059..ce2c3e4 100644
--- a/FlyCube/MpApi/Controller/PayController.class.php
+++ b/FlyCube/MpApi/Controller/PayController.class.php
@@ -77,10 +77,11 @@ class PayController extends PublicController
             exit();
         }
 
+
         // 设置退款参数
         $refundParameter = [
             'out_trade_no' => $order['order_sn'], // 商户订单号
-            'out_refund_no' => $order['order_sn'] . '_refund', // 商户退款单号
+            'out_refund_no' => $order['order_sn'] . '_' . $_REQUEST['refund_type'], // 商户退款单号
             'amount' => [
                 'refund' => $_REQUEST['refund_price'] * 100, // 退款金额，单位：分
                 'total' => $order['total_price'] * 100, // 订单金额，单位：分
@@ -106,7 +107,9 @@ class PayController extends PublicController
         try {
             // 实例化 Yansongda Pay 并处理回调
             $result = Pay::wechat($this->config)->callback();
-            $this->publish("demo", $result);
+            $outRefundNo = $result['resource']['ciphertext']['out_refund_no'];
+            $refundType = substr($outRefundNo, strrpos($outRefundNo, '_'));
+            $this->publish("demo", $refundType);
 
             // 验证成功，处理业务逻辑
             if ($result['resource']['ciphertext']['refund_status'] == 'SUCCESS') {