From 1db84238de603f6e68276fd5c5941e59e269be1f Mon Sep 17 00:00:00 2001
From: weizong song <sdswz@qq.com>
Date: Tue, 1 Mar 2022 09:03:01 +0800
Subject: [PATCH] up

---
 .../Controllers/Manager/OrdersController.php  |  1 +
 ...03_01_085910_add_merchant_id_to_refund.php | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 database/migrations/2022_03_01_085910_add_merchant_id_to_refund.php

diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php
index c8ba9cb..b7bcc70 100644
--- a/app/Http/Controllers/Manager/OrdersController.php
+++ b/app/Http/Controllers/Manager/OrdersController.php
@@ -1645,6 +1645,7 @@ class OrdersController extends CommonController
                     $recharge = Recharge::find(request()->recharge_id);
                     $refund["payment"] = $recharge->payment;
                     $refund["recharge_id"] = request()->recharge_id;
+                    $refund["merchant_id"] = $recharge->merchant_id;
                     break;
                 default:
                     return response()->json([
diff --git a/database/migrations/2022_03_01_085910_add_merchant_id_to_refund.php b/database/migrations/2022_03_01_085910_add_merchant_id_to_refund.php
new file mode 100644
index 0000000..65b0858
--- /dev/null
+++ b/database/migrations/2022_03_01_085910_add_merchant_id_to_refund.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddMerchantIdToRefund extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('refund', function (Blueprint $table) {
+            $table->string("merchant_id")->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('refund', function (Blueprint $table) {
+            //
+        });
+    }
+}