diff --git a/crmeb/app/api/controller/v2/wechat/AuthController.php b/crmeb/app/api/controller/v2/wechat/AuthController.php index 5ff029afc..ea54d4920 100644 --- a/crmeb/app/api/controller/v2/wechat/AuthController.php +++ b/crmeb/app/api/controller/v2/wechat/AuthController.php @@ -76,7 +76,7 @@ class AuthController if ($token && isset($token['key'])) { return app('json')->success(410022, $token); } else if ($token) { - return app('json')->success(410001, ['token' => $token['token'], 'expires_time' => $token['params']['exp']]); + return app('json')->success(410001, ['token' => $token['token'], 'expires_time' => $token['params']['exp'], 'new_user' => $token['new_user']]); } else return app('json')->fail(410019); } @@ -123,7 +123,7 @@ class AuthController CacheService::delete('code_' . $phone); $token = $this->services->silenceAuthBindingPhone($code, $spread_code, $spread_spid, $phone); if ($token) { - return app('json')->success(410001, ['token' => $token['token'], 'expires_time' => $token['params']['exp']]); + return app('json')->success(410001, ['token' => $token['token'], 'expires_time' => $token['params']['exp'], 'new_user' => $token['new_user']]); } else return app('json')->fail(410019); } @@ -138,7 +138,7 @@ class AuthController * @param string $key * @return mixed */ - public function authBindingPhone($code = '', $iv = '', $encryptedData ='', $spread_code ='', $spread_spid = '', $key = '') + public function authBindingPhone($code = '', $iv = '', $encryptedData = '', $spread_code = '', $spread_spid = '', $key = '') { if (!$code || !$iv || !$encryptedData) return app('json')->fail(100100); diff --git a/crmeb/app/services/wechat/RoutineServices.php b/crmeb/app/services/wechat/RoutineServices.php index 06d4a5bde..73aac6686 100644 --- a/crmeb/app/services/wechat/RoutineServices.php +++ b/crmeb/app/services/wechat/RoutineServices.php @@ -276,6 +276,7 @@ class RoutineServices extends BaseServices $user = $wechatUserServices->wechatOauthAfter($createData); $token = $this->createToken((int)$user['uid'], 'routine'); if ($token) { + $token['new_user'] = 1; return $token; } else throw new ApiException(410019); @@ -288,6 +289,7 @@ class RoutineServices extends BaseServices $visitServices = app()->make(UserVisitServices::class); $visitServices->loginSaveVisit($user); if ($token) { + $token['new_user'] = 0; return $token; } else throw new ApiException(410019); @@ -389,6 +391,7 @@ class RoutineServices extends BaseServices $visitServices = app()->make(UserVisitServices::class); $visitServices->loginSaveVisit($user); if ($token) { + $token['new_user'] = $user['new_user']; return $token; } else throw new ApiException(410019); diff --git a/crmeb/app/services/wechat/WechatUserServices.php b/crmeb/app/services/wechat/WechatUserServices.php index 52e727f38..9aa74730d 100644 --- a/crmeb/app/services/wechat/WechatUserServices.php +++ b/crmeb/app/services/wechat/WechatUserServices.php @@ -317,6 +317,7 @@ class WechatUserServices extends BaseServices } if ($userInfo) { $uid = (int)$userInfo['uid']; + $userInfo['new_user'] = 0; } $wechatInfo['user_type'] = $userType; //user表存在和wechat_user表同时存在 @@ -354,6 +355,7 @@ class WechatUserServices extends BaseServices if (!$this->dao->save($wechatInfo)) { throw new AuthException(410083); } + $userInfo['new_user'] = 1; return $userInfo; }); }