yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2024-09-20 12:54:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
root 2019-11-04 02:06:21 +08:00
parent ae38f7a840
commit 8a99e58fe1
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/Admin/OrderController.php
View File

@ -6,6 +6,7 @@ use Illuminate\Http\Request;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Models\Order; use App\Models\Order;
use App\Models\User; use App\Models\User;
use App\Models\Plan;
class OrderController extends Controller class OrderController extends Controller
{ {
@ -17,9 +18,18 @@ class OrderController extends Controller
$orderModel->where('trade_no', $request->input('trade_no')); $orderModel->where('trade_no', $request->input('trade_no'));
} }
$total = $orderModel->count(); $total = $orderModel->count();
$res = $orderModel->forPage($current, $pageSize)
->get();
$plan = Plan::get();
for ($i = 0; $i < count($res); $i++) {
for ($k = 0; $k < count($plan); $k++) {
if ($plan[$k]['id'] == $res[$i]['plan_id']) {
$res[$i]['plan_name'] = $plan[$k]['name'];
}
}
}
return response([ return response([
'data' => $orderModel->forPage($current, $pageSize) 'data' => $res,
->get(),
'total' => $total 'total' => $total
]); ]);
} }