From a78b692cd47b7300f67994cdb31e60e52a0a0c4b Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Thu, 14 Sep 2023 13:40:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index 8c7f5351..079ddbef 100644
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -207,6 +207,7 @@ class Auth extends BaseController
         // 判断是否是商户，并且有没有完善信息
         // 这里有点小问题以后要修改
         $store_service = Db::name('store_service')->where('uid', $data['uid'])->find();
+        
         if ($store_service) {
             $mer_arr = Db::name('merchant')->where('mer_id', $store_service['mer_id'])->where('is_del', 0)->field('type_id,mer_avatar,mer_banner,mer_info,category_id,service_phone,mer_address,uid,mer_name,create_time,update_time')->find();
             if ($mer_arr && $mer_arr['mer_avatar'] != '' && $mer_arr['mer_banner'] != '' && $mer_arr['mer_info'] && $mer_arr['service_phone'] != '' && $mer_arr['mer_address'] != '') {
@@ -215,7 +216,7 @@ 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;
-            if ($mer_arr['create_time'] == $mer_arr['update_time']) {
+            if (($mer_arr['create_time'] ?? '') ==  ($mer_arr['update_time'] ?? '')) {
                 $data['mer_info']['setup_status'] = 0;
             } else {
                 $data['mer_info']['setup_status'] = 1;