yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2025-06-16 14:47:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

update: new auth

Browse Source
This commit is contained in:
tokumeikoi
2022-07-19 03:11:36 +08:00
parent dc27410c12
commit adf465696a
22 changed files with 132 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Http/Controllers/User/OrderController.php
View File

@ -29,7 +29,7 @@ class OrderController extends Controller
{
public function fetch(Request $request)
{
$model = Order::where('user_id', $request->user->id)
$model = Order::where('user_id', $request->user['id'])
->orderBy('created_at', 'DESC');
if ($request->input('status') !== null) {
$model->where('status', $request->input('status'));
@ -50,7 +50,7 @@ class OrderController extends Controller
public function detail(Request $request)
{
$order = Order::where('user_id', $request->user->id)
$order = Order::where('user_id', $request->user['id'])
->where('trade_no', $request->input('trade_no'))
->first();
if (!$order) {
@ -72,14 +72,14 @@ class OrderController extends Controller
public function save(OrderSave $request)
{
$userService = new UserService();
if ($userService->isNotCompleteOrderByUserId($request->user->id)) {
if ($userService->isNotCompleteOrderByUserId($request->user['id'])) {
abort(500, __('You have an unpaid or pending order, please try again later or cancel it'));
}
$planService = new PlanService($request->input('plan_id'));
$plan = $planService->plan;
$user = User::find($request->user->id);
$user = User::find($request->user['id']);
if (!$plan) {
abort(500, __('Subscription plan does not exist'));
@ -94,7 +94,7 @@ class OrderController extends Controller
}
if ($request->input('period') === 'reset_price') {
if (!$user->plan_id) {
if (!$user->plan_id || $user->expired_at < time() || $user->expired_at !== NULL) {
abort(500, __('Subscription has expired or no active subscription, unable to purchase Data Reset Package'));
} else {
if ($user->plan_id !== $plan->id) {
@ -121,7 +121,7 @@ class OrderController extends Controller
DB::beginTransaction();
$order = new Order();
$orderService = new OrderService($order);
$order->user_id = $request->user->id;
$order->user_id = $request->user['id'];
$order->plan_id = $plan->id;
$order->period = $request->input('period');
$order->trade_no = Helper::generateOrderNo();
@ -177,7 +177,7 @@ class OrderController extends Controller
$tradeNo = $request->input('trade_no');
$method = $request->input('method');
$order = Order::where('trade_no', $tradeNo)
->where('user_id', $request->user->id)
->where('user_id', $request->user['id'])
->where('status', 0)
->first();
if (!$order) {
@ -216,7 +216,7 @@ class OrderController extends Controller
{
$tradeNo = $request->input('trade_no');
$order = Order::where('trade_no', $tradeNo)
->where('user_id', $request->user->id)
->where('user_id', $request->user['id'])
->first();
if (!$order) {
abort(500, __('Order does not exist'));
@ -249,7 +249,7 @@ class OrderController extends Controller
abort(500, __('Invalid parameter'));
}
$order = Order::where('trade_no', $request->input('trade_no'))
->where('user_id', $request->user->id)
->where('user_id', $request->user['id'])
->first();
if (!$order) {
abort(500, __('Order does not exist'));