From d0ee2cd1784915100c5353da99faf6967deb5b44 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 20 Apr 2023 14:20:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/merchant/MerchantIntentionRepository.php           | 1 +
 app/controller/api/Auth.php                                   | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/common/repositories/system/merchant/MerchantIntentionRepository.php b/app/common/repositories/system/merchant/MerchantIntentionRepository.php
index 941f8b84..65701980 100644
--- a/app/common/repositories/system/merchant/MerchantIntentionRepository.php
+++ b/app/common/repositories/system/merchant/MerchantIntentionRepository.php
@@ -124,6 +124,7 @@ class MerchantIntentionRepository extends BaseRepository
                 'category_id' => $intention['merchant_category_id'],
                 'type_id' => $intention['mer_type_id'],
                 'real_name' => $intention['name'],
+                'uid'=>$intention['uid'],
                 'status' => 1,
                 'is_audit' => 1,
                 'is_bro_room' => $config['broadcast_room_type'] == 1 ? 0 : 1,
diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php
index 6413bba7..e95a1126 100644
--- a/app/controller/api/Auth.php
+++ b/app/controller/api/Auth.php
@@ -174,14 +174,16 @@ class Auth extends BaseController
         $data['merchant_login'] = $this->request->domain().'/merchant';
         $data['is_wsxx'] = 0;
 
+        $data['mer_info']=[];
 //        判断是否是商户，并且有没有完善信息
         //这里有点小问题以后要修改
         $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)->where('status',1)->field('mer_avatar,mer_banner,mer_info,service_phone,mer_address')->find();
+            $mer_arr = Db::name('merchant')->where('mer_id',$store_service['mer_id'])->where('is_del',0)->where('status',1)->field('type_id,mer_avatar,mer_banner,mer_info,service_phone,mer_address,uid,mer_name')->find();
             if($mer_arr && $mer_arr['mer_avatar']!=''&& $mer_arr['mer_banner'] !='' && $mer_arr['mer_info'] && $mer_arr['service_phone']!=''&& $mer_arr['mer_address']!=''){
                 $data['is_wsxx'] = 1;
             }
+            $data['mer_info']=$mer_arr;
         }
 
         return app('json')->success($data);