diff --git a/app/Admin/Controllers/TestController.php b/app/Admin/Controllers/TestController.php index 9420920..a52fa10 100644 --- a/app/Admin/Controllers/TestController.php +++ b/app/Admin/Controllers/TestController.php @@ -42,6 +42,7 @@ class TestController extends Controller $tables = [ 'admin_operation_log', + 'areas', 'area_stocks', 'area_codes', 'area_clerks', diff --git a/modules/User/Http/Controllers/Admin/IndexController.php b/modules/User/Http/Controllers/Admin/IndexController.php index b54905b..4c164b4 100644 --- a/modules/User/Http/Controllers/Admin/IndexController.php +++ b/modules/User/Http/Controllers/Admin/IndexController.php @@ -168,7 +168,7 @@ class IndexController extends AdminController public function ajax(Request $request) { $q = $request->get('q'); - dd(1); + return User::leftJoin('user_infos as info', 'users.id', '=', 'info.user_id') ->where('username', 'like', "%$q%") ->orWhere('info.nickname', 'like', "%$q%") diff --git a/modules/User/Http/Controllers/Api/Socialite/WeChatController.php b/modules/User/Http/Controllers/Api/Socialite/WeChatController.php index b52a943..36cad46 100644 --- a/modules/User/Http/Controllers/Api/Socialite/WeChatController.php +++ b/modules/User/Http/Controllers/Api/Socialite/WeChatController.php @@ -9,6 +9,7 @@ use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\Validator; use Jason\Api\Api; +use Modules\Task\Facades\TaskFacade; use Modules\User\Events\UserLoginSuccess; use Modules\User\Facades\Sms; use Modules\User\Http\Requests\WechatMiniRequest; @@ -421,8 +422,13 @@ class WeChatController extends Controller } - $token = Api::login($user); - + $token = Api::login($user); + $is_new = $user->wasRecentlyCreated; + if ($is_new && $user->parent) { + TaskFacade::do('friend_registration', $user->parent->id, [ + 'user_id' => $user->id + ]); + } return $this->success([ 'token_type' => 'Bearer', 'access_token' => $token,