From 2ed0f06c6f2627675171ec3f2793063a4bc260ca Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 8 May 2024 18:41:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/service/WechatUserService.php  | 2 +-
 app/common/cache/UserTokenCache.php    | 6 +++---
 app/common/model/supplier/Supplier.php | 6 +++++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/api/service/WechatUserService.php b/app/api/service/WechatUserService.php
index a9b765b..2c54318 100644
--- a/app/api/service/WechatUserService.php
+++ b/app/api/service/WechatUserService.php
@@ -77,7 +77,7 @@ class WechatUserService
 
         $this->user = $user;
         if(!$user->isEmpty()){
-            $this->user->supplier=Supplier::where('uid',$user['id'])->field('id,mer_name')->find();
+            $this->user->supplier=Supplier::where('uid',$user['id'])->with('userAuth')->field('id,mer_name')->find();
         }
         // $this->user->merchat=Merchant::where('uid',$user['id'])->find();
         return $this;
diff --git a/app/common/cache/UserTokenCache.php b/app/common/cache/UserTokenCache.php
index 150fa44..ace86c4 100644
--- a/app/common/cache/UserTokenCache.php
+++ b/app/common/cache/UserTokenCache.php
@@ -74,12 +74,12 @@ class UserTokenCache extends BaseCache
 
         $user = User::where('id', '=', $userSession->user_id)
             ->find();
-        $merchant=Merchant::where('uid',$userSession->user_id)->find();
-        $supplier=Supplier::where('uid',$userSession->user_id)->find();
+        // $merchant=Merchant::where('uid',$userSession->user_id)->find();
+        $supplier=Supplier::where('uid',$userSession->user_id)->with('userAuth')->find();
         $userInfo = [
             'user_id' => $user->id,
             'nickname' => $user->nickname,
-            'merchant' => $merchant,
+            // 'merchant' => $merchant,
             'supplier' => $supplier,
             'token' => $token,
             'mobile' => $user->mobile,
diff --git a/app/common/model/supplier/Supplier.php b/app/common/model/supplier/Supplier.php
index 324c9ce..9a62d47 100644
--- a/app/common/model/supplier/Supplier.php
+++ b/app/common/model/supplier/Supplier.php
@@ -4,6 +4,7 @@ namespace app\common\model\supplier;
 
 
 use app\common\model\BaseModel;
+use app\common\model\user\UserAuth;
 use think\model\concern\SoftDelete;
 
 
@@ -18,5 +19,8 @@ class Supplier extends BaseModel
     protected $name = 'supplier';
     protected $deleteTime = 'delete_time';
 
-    
+    public function userAuth()
+	{
+		return $this->hasOne(UserAuth::class, 'id', 'uid')->bind(['openid']);
+	}
 }
\ No newline at end of file