From 05aa1dffdd4ba4480f843f06f10c930fba2b8493 Mon Sep 17 00:00:00 2001 From: weizong song Date: Wed, 17 Apr 2024 09:27:40 +0800 Subject: [PATCH] up --- app/Http/Controllers/Manager/OrdersController.php | 14 ++++++++++++++ app/Models/Orders.php | 1 + 2 files changed, 15 insertions(+) diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php index 688842f..90e65b0 100644 --- a/app/Http/Controllers/Manager/OrdersController.php +++ b/app/Http/Controllers/Manager/OrdersController.php @@ -1431,6 +1431,9 @@ class OrdersController extends CommonController case "alipay": $res = (new AlipayF2F())->pay($recharge); if ($res["status"]) { + $recharge->update([ + "merchant_id" => env("ALI_APP_ID") + ]); return response()->json(true); } else { return response()->json([ @@ -1708,8 +1711,19 @@ class OrdersController extends CommonController $refund["paid_at"] = date("Y-m-d H:i:s"); break; case "weixin": + $recharge = Recharge::find(request()->recharge_id); + $refund["payment"] = $recharge->payment; + $refund["recharge_id"] = request()->recharge_id; + $refund["merchant_id"] = $recharge->merchant_id; + break; case "alipay": $recharge = Recharge::find(request()->recharge_id); + if (!$recharge->merchant_id) { + return response()->json([ + "errorcode" => "0", + "errormsg" => "本单支付宝退款暂不支持" + ]); + } $refund["payment"] = $recharge->payment; $refund["recharge_id"] = request()->recharge_id; $refund["merchant_id"] = $recharge->merchant_id; diff --git a/app/Models/Orders.php b/app/Models/Orders.php index 8095c1b..dc5c1c5 100755 --- a/app/Models/Orders.php +++ b/app/Models/Orders.php @@ -423,6 +423,7 @@ class Orders extends SoftDeletesModel $recharge = Recharge::where("order_id", $this->id) ->whereNotNull("paid_at") ->whereIn("payment", ["weixin", "alipay"]) + ->whereNotNull("merchant_id") ->where("money", ">=", $amount) ->doesntHave("refunds") ->orderBy("id", "desc")