yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2025-10-31 01:11:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

update: optimize commission calculation

Browse Source
This commit is contained in:
tokumeikoi
2022-02-07 15:35:40 +08:00
parent 9dc44c0e1d
commit 1d5a493ef1
4 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Admin;
use App\Http\Requests\Admin\OrderAssign;
use App\Http\Requests\Admin\OrderUpdate;
use App\Http\Requests\Admin\OrderFetch;
use App\Models\CommissionLog;
use App\Services\OrderService;
use App\Services\UserService;
use App\Utils\Helper;
@@ -36,6 +37,19 @@ class OrderController extends Controller
}
}
public function detail(Request $request)
{
$order = Order::find($request->input('id'));
if (!$order) abort(500, '订单不存在');
$order['commission_log'] = CommissionLog::where('trade_no', $order->trade_no)->get();
if ($order->surplus_order_ids) {
$order['surplus_orders'] = Order::whereIn('id', $order->surplus_order_ids)->get();
}
return response([
'data' => $order
]);
}
public function fetch(OrderFetch $request)
{
$current = $request->input('current') ? $request->input('current') : 1;