更新解析token

app/api/logic/LoginLogic.php

@@ -227,10 +227,37 @@ class LoginLogic extends BaseLogic
             }
             $where = ['account|mobile' => $jwtData['phone']];
             $user = User::where($where)->findOrEmpty();
+            if ($user->isEmpty()) {
+                $user_id = $jwtData['uid'];
+                $find = Db::name('user_other')->where('other_user_id', $user_id)->where('type', 'shop_user')->find();
+                if ($find) {
+                    $user = User::where('id', $find['user_id'])->findOrEmpty();
                     if ($user->isEmpty()) {
                         self::setError('用户不存在，请联系管理员开通供销系统账户');
                         return false;
                     }
+                    $terminal=3;
+                    $Android=IndexLogic::isAndroid();
+                    if($Android){
+                        $terminal=5;
+                    }
+                    $ios=IndexLogic::isIOS();
+                    if($ios){
+                        $terminal=6;
+                    }
+                    $userInfo = UserTokenService::setToken($user->id, $terminal);
+                    //返回登录信息
+                    $avatar = $user->avatar ?: Config::get('project.default_image.user_avatar');
+                    $avatar = FileService::getFileUrl($avatar);
+                    return [
+                        'nickname' => $userInfo['nickname'],
+                        'sn' => $userInfo['sn'],
+                        'mobile' => $userInfo['mobile'],
+                        'avatar' => $avatar,
+                        'token' => $userInfo['token'],
+                    ];
+                }
+            }
             //更新登录信息
             $user->login_time = time();
             $user->login_ip = request()->ip();