From 5f33322c5b4077739fb3e26577bca304e81647f1 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Tue, 28 May 2019 17:16:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/service/OrderAftersaleService.php |  6 +++---
 extend/payment/Alipay.php                     | 10 +++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/application/service/OrderAftersaleService.php b/application/service/OrderAftersaleService.php
index 071ee413c..fb0e14b3b 100644
--- a/application/service/OrderAftersaleService.php
+++ b/application/service/OrderAftersaleService.php
@@ -856,13 +856,13 @@ class OrderAftersaleService
             'order_id'      => $order['id'],
             'total_price'   => $order['total_price'],
             'trade_no'      => isset($ret['data']['trade_no']) ? $ret['data']['trade_no'] : '',
-            'buyer_user'    => isset($ret['data']['buyer_user_id']) ? $ret['data']['buyer_user_id'] : '',
-            'refund_price'  => $aftersale['price'],
+            'buyer_user'    => isset($ret['data']['buyer_user']) ? $ret['data']['buyer_user'] : '',
+            'refund_price'  => isset($ret['data']['refund_price']) ? $ret['data']['refund_price'] : '',
             'msg'           => $pay_params['refund_reason'],
             'payment'       => $pay_log['payment'],
             'payment_name'  => $pay_log['payment_name'],
             'business_type' => 1,
-            'return_params' => $ret['data'],
+            'return_params' => isset($ret['data']['return_params']) ? $ret['data']['return_params'] : '',
         ];
         RefundLogService::RefundLogInsert($refund_log);
         return $ret;
diff --git a/extend/payment/Alipay.php b/extend/payment/Alipay.php
index a2fd53078..2e1bd9121 100755
--- a/extend/payment/Alipay.php
+++ b/extend/payment/Alipay.php
@@ -345,7 +345,15 @@ class Alipay
         // 状态
         if(isset($result[$key]['code']) && $result[$key]['code'] == 10000)
         {
-            return DataReturn('退款成功', 0, $result[$key]);
+            // 统一返回格式
+            $data = [
+                'out_trade_no'  => isset($result[$key]['out_trade_no']) ? $result[$key]['out_trade_no'] : '',
+                'trade_no'      => isset($result[$key]['trade_no']) ? $result[$key]['trade_no'] : '',
+                'buyer_user'    => isset($result[$key]['buyer_user_id']) ? $result[$key]['buyer_user_id'] : '',
+                'refund_price'  => isset($result[$key]['refund_fee']) ? $result[$key]['refund_fee'] : 0.00,
+                'return_params' => $result[$key],
+            ];
+            return DataReturn('退款成功', 0, $data);
         }
 
         // 直接返回支付信息