mkm/erp_old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2024-05-08 18:41:41 +08:00
parent 15729aacd7
commit 2ed0f06c6f
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/service/WechatUserService.php
View File

@ -77,7 +77,7 @@ class WechatUserService
$this->user = $user; $this->user = $user;
if(!$user->isEmpty()){ 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(); // $this->user->merchat=Merchant::where('uid',$user['id'])->find();
return $this; return $this;

6
app/common/cache/UserTokenCache.php vendored
View File

@ -74,12 +74,12 @@ class UserTokenCache extends BaseCache
$user = User::where('id', '=', $userSession->user_id) $user = User::where('id', '=', $userSession->user_id)
->find(); ->find();
$merchant=Merchant::where('uid',$userSession->user_id)->find(); // $merchant=Merchant::where('uid',$userSession->user_id)->find();
$supplier=Supplier::where('uid',$userSession->user_id)->find(); $supplier=Supplier::where('uid',$userSession->user_id)->with('userAuth')->find();
$userInfo = [ $userInfo = [
'user_id' => $user->id, 'user_id' => $user->id,
'nickname' => $user->nickname, 'nickname' => $user->nickname,
'merchant' => $merchant, // 'merchant' => $merchant,
'supplier' => $supplier, 'supplier' => $supplier,
'token' => $token, 'token' => $token,
'mobile' => $user->mobile, 'mobile' => $user->mobile,

6
app/common/model/supplier/Supplier.php
View File

@ -4,6 +4,7 @@ namespace app\common\model\supplier;
use app\common\model\BaseModel; use app\common\model\BaseModel;
use app\common\model\user\UserAuth;
use think\model\concern\SoftDelete; use think\model\concern\SoftDelete;
@ -18,5 +19,8 @@ class Supplier extends BaseModel
protected $name = 'supplier'; protected $name = 'supplier';
protected $deleteTime = 'delete_time'; protected $deleteTime = 'delete_time';
public function userAuth()
{
return $this->hasOne(UserAuth::class, 'id', 'uid')->bind(['openid']);
}
} }