|
|
@@ -2829,14 +2829,32 @@ class UserRepository extends BaseRepository
|
|
2829
|
2829
|
}
|
|
2830
|
2830
|
public function getAccount($uid)
|
|
2831
|
2831
|
{
|
|
|
2832
|
+ $userAccountList = Db::name("user_account")
|
|
|
2833
|
+ ->where(["uid"=>$uid])
|
|
|
2834
|
+ ->select()
|
|
|
2835
|
+ ->toArray();
|
|
|
2836
|
+ $wxNickname = '';
|
|
|
2837
|
+ $wxAvater = '';
|
|
|
2838
|
+ $alNickname = '';
|
|
|
2839
|
+ $alAvater = '';
|
|
|
2840
|
+ foreach ($userAccountList as $userAccount) {
|
|
|
2841
|
+ if ($userAccount['type'] == 1) {
|
|
|
2842
|
+ $wxNickname = $userAccount['nickname'];
|
|
|
2843
|
+ $wxAvater = $userAccount['avater'];
|
|
|
2844
|
+ } else if ($userAccount['type'] == 2) {
|
|
|
2845
|
+ $alNickname = $userAccount['nickname'];
|
|
|
2846
|
+ $alAvater = $userAccount['avater'];
|
|
|
2847
|
+ }
|
|
|
2848
|
+ }
|
|
2832
|
2849
|
$res=Db::name('user_extract_openid')->where('uid',$uid)->value('openid');
|
|
2833
|
2850
|
if($res){
|
|
|
2851
|
+
|
|
2834
|
2852
|
$arr[]=array(
|
|
2835
|
2853
|
'id'=>'1',
|
|
2836
|
2854
|
'type'=>'1',
|
|
2837
|
2855
|
'uid'=>$uid,
|
|
2838
|
|
- 'nickname'=>'',
|
|
2839
|
|
- 'avater'=>'',
|
|
|
2856
|
+ 'nickname'=>$wxNickname,
|
|
|
2857
|
+ 'avater'=>$wxAvater,
|
|
2840
|
2858
|
);
|
|
2841
|
2859
|
}
|
|
2842
|
2860
|
$res = Db::name('user') -> where('uid',$uid) -> value('ali_user_id');
|
|
|
@@ -2845,8 +2863,8 @@ class UserRepository extends BaseRepository
|
|
2845
|
2863
|
'id'=>'2',
|
|
2846
|
2864
|
'type'=>'2',
|
|
2847
|
2865
|
'uid'=>$uid,
|
|
2848
|
|
- 'nickname'=>'',
|
|
2849
|
|
- 'avater'=>'',
|
|
|
2866
|
+ 'nickname'=>$alNickname,
|
|
|
2867
|
+ 'avater'=>$alAvater,
|
|
2850
|
2868
|
);
|
|
2851
|
2869
|
}
|
|
2852
|
2870
|
return isset($arr)?$arr:[];
|