xuanchen/water-back
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

调整邀请注册任务

Browse Source
This commit is contained in:
徐永宾
2023-01-29 11:16:23 +08:00
parent 70fd7e70be
commit a10311b618
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Admin/Controllers/TestController.php
View File

@@ -42,6 +42,7 @@ class TestController extends Controller
$tables = [ $tables = [
'admin_operation_log', 'admin_operation_log',
'areas',
'area_stocks', 'area_stocks',
'area_codes', 'area_codes',
'area_clerks', 'area_clerks',

2
modules/User/Http/Controllers/Admin/IndexController.php
View File

@@ -168,7 +168,7 @@ class IndexController extends AdminController
public function ajax(Request $request) public function ajax(Request $request)
{ {
$q = $request->get('q'); $q = $request->get('q');
dd(1);
return User::leftJoin('user_infos as info', 'users.id', '=', 'info.user_id') return User::leftJoin('user_infos as info', 'users.id', '=', 'info.user_id')
->where('username', 'like', "%$q%") ->where('username', 'like', "%$q%")
->orWhere('info.nickname', 'like', "%$q%") ->orWhere('info.nickname', 'like', "%$q%")

8
modules/User/Http/Controllers/Api/Socialite/WeChatController.php
View File

@@ -9,6 +9,7 @@ use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Validator; use Illuminate\Support\Facades\Validator;
use Jason\Api\Api; use Jason\Api\Api;
use Modules\Task\Facades\TaskFacade;
use Modules\User\Events\UserLoginSuccess; use Modules\User\Events\UserLoginSuccess;
use Modules\User\Facades\Sms; use Modules\User\Facades\Sms;
use Modules\User\Http\Requests\WechatMiniRequest; use Modules\User\Http\Requests\WechatMiniRequest;
@@ -422,7 +423,12 @@ 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([ return $this->success([
'token_type' => 'Bearer', 'token_type' => 'Bearer',
'access_token' => $token, 'access_token' => $token,