From da4132807d24940d506626080343dcc9e20df31f Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Wed, 27 Sep 2023 10:26:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=9D=E8=AF=81=E9=87=91?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/store/merchant/Merchant.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controller/api/store/merchant/Merchant.php b/app/controller/api/store/merchant/Merchant.php
index c6c31de9..32f832be 100644
--- a/app/controller/api/store/merchant/Merchant.php
+++ b/app/controller/api/store/merchant/Merchant.php
@@ -269,10 +269,10 @@ class Merchant extends BaseController
             return app('json')->fail('参数错误');
         }
         $merchantInfo['unpaid_margin'] = $merchantInfo['margin'];
-        if ($merchant['first_margin'] > 0 && $merchant['first_margin_status'] == 0) {
+        if ($merchantInfo['first_margin'] > 0 && $merchantInfo['first_margin_status'] == 0) {
             $merchantInfo['margin'] = $merchantInfo['first_margin'];
         } else {
-            $merchantInfo['margin'] = $merchantTypeInfo['margin'];
+            $merchantInfo['margin'] = $merchantInfo['margin'];
         }
         return app('json')->success($merchantInfo);
     }