Browse Source

去掉TODO

develop
李可松 4 years ago
parent
commit
a7544e01c5
  1. 1
      app/Http/Controllers/Api/LoginController.php
  2. 2
      app/Http/Controllers/Api/OrderController.php
  3. 1
      app/Http/Controllers/Controller.php
  4. 2
      app/Http/Middleware/ApiAuth.php

1
app/Http/Controllers/Api/LoginController.php

@ -54,7 +54,6 @@ class LoginController extends Controller
return $this->error($e->getMessage()); return $this->error($e->getMessage());
} }
// TODO 登录部分待优化
$userModel = User::query()->firstOrCreate([ $userModel = User::query()->firstOrCreate([
'openid' => $res['openid'] ?? '', 'openid' => $res['openid'] ?? '',
'agent_id' => $agent->id, 'agent_id' => $agent->id,

2
app/Http/Controllers/Api/OrderController.php

@ -30,8 +30,6 @@ use Illuminate\Support\Facades\Storage;
*/ */
class OrderController extends Controller class OrderController extends Controller
{ {
private $earnest = 200; //定金和首款默认金额 TODO 定金支付和首款支付暂定为200
//订单列表 //订单列表
public function index(Request $request) public function index(Request $request)
{ {

1
app/Http/Controllers/Controller.php

@ -17,7 +17,6 @@ class Controller extends BaseController
public function __construct() public function __construct()
{ {
// TODO 登录部分待优化
$auth = request()->header('Authentication'); $auth = request()->header('Authentication');
$appid = request()->header('appid'); $appid = request()->header('appid');

2
app/Http/Middleware/ApiAuth.php

@ -29,7 +29,7 @@ class ApiAuth
]); ]);
} }
//检查用户 TODO 登录部分待优化
//检查用户
$user_id = Cache::get($auth); $user_id = Cache::get($auth);
if (empty($user_id) || $user_id != User::query()->where(['id' => $user_id, 'status' => 1])->value('id')) { if (empty($user_id) || $user_id != User::query()->where(['id' => $user_id, 'status' => 1])->value('id')) {
return response()->json([ return response()->json([

Loading…
Cancel
Save