From 809988de1f607a1004e558c0093c22f3c3f08c1a Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Tue, 19 Sep 2023 17:48:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=95=86=E5=AE=B6=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/Auth.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index c077393e..d0fb12d2 100644
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -217,7 +217,10 @@ class Auth extends BaseController
             $data['mer_info'] = $mer_arr;
             $typCode = Db::name('merchant_type')->where('mer_type_id', $mer_arr['type_id'] ?? 0)->value('type_code');
             $data['mer_info']['type_code'] = $typCode;
-            // 交易申请状态：0未申请 1申请中 2申请通过 3申请拒绝
+            $data['mer_info']['setting_status'] = 0;
+            if (($mer_arr['update_time'] ?? '') > ($mer_arr['create_time'] ?? '')) {
+                $data['mer_info']['setting_status'] = 1;
+            }
         }
         $data['fan_num']   = app()->make(RelevanceRepository::class)->getUserFans($user->uid, 1, 1, 1);
         $data['focus_num'] = app()->make(RelevanceRepository::class)->getUserFocus($user->uid, 1, 1, 1);