From 020dba4f2f33146a11cae91ef4f1feea00491393 Mon Sep 17 00:00:00 2001
From: weizong song <sdswz@qq.com>
Date: Tue, 13 Apr 2021 02:11:46 +0800
Subject: [PATCH] up

---
 app/Customer.php                                  | 7 ++++++-
 app/Http/Controllers/Manager/OrdersController.php | 6 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/Customer.php b/app/Customer.php
index 8694b8b..52125c5 100644
--- a/app/Customer.php
+++ b/app/Customer.php
@@ -129,7 +129,12 @@ class Customer extends Authenticatable implements JWTSubject
     {
         //todo:根据交易状态是否可以退款、以及多次退款金额是否足够进行更精准筛选
         //but:出问题的几率微乎其微可以忽略
-        $recharge = Recharge::where("customer_id", $this->id)->whereNotNull("paid_at")->doesntHave("refunds")->orderBy("id", "desc")->first();
+        $recharge = Recharge::where("customer_id", $this->id)
+            ->whereNotNull("paid_at")
+            ->whereIn("payment", ["weixin", "alipay"])
+            ->doesntHave("refunds")
+            ->orderBy("id", "desc")
+            ->first();
         return $recharge;
     }
 }
diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php
index 4464702..4694679 100644
--- a/app/Http/Controllers/Manager/OrdersController.php
+++ b/app/Http/Controllers/Manager/OrdersController.php
@@ -945,7 +945,7 @@ class OrdersController extends CommonController
      *                         description="在线退款原路返回对应的在线充值id"
      *                     ),
      *                      @OA\Property(
-     *                         property="refund_recharge_serial",
+     *                         property="refund_recharge_transaction_id",
      *                         type="integer",
      *                         description="在线退款原路返回所对应的在线充值记录的支付平台交易编号"
      *                     ),
@@ -1030,7 +1030,7 @@ class OrdersController extends CommonController
                 "to_refund_total" => $to_refund_total,
                 "refund_payment" => $recharge_for_online_refund ? $recharge_for_online_refund->payment : "cash",
                 "refund_recharge_id" => $recharge_for_online_refund ? $recharge_for_online_refund->id : null,
-                "refund_recharge_serial" => $recharge_for_online_refund ? $recharge_for_online_refund->payment_serial : null
+                "refund_recharge_transaction_id" => $recharge_for_online_refund ? $recharge_for_online_refund->payment_serial : null
             ]);
         }
 
@@ -1054,7 +1054,7 @@ class OrdersController extends CommonController
                 "to_refund_total" => $to_refund_total,
                 "refund_payment" => $recharge_for_online_refund ? $recharge_for_online_refund->payment : "cash",
                 "refund_recharge_id" => $recharge_for_online_refund ? $recharge_for_online_refund->id : null,
-                "refund_recharge_serial" => $recharge_for_online_refund ? $recharge_for_online_refund->payment_serial : null
+                "refund_recharge_transaction_id" => $recharge_for_online_refund ? $recharge_for_online_refund->payment_serial : null
             ]);
         }