|
@@ -26,7 +26,6 @@ class JisuGameOrder extends Controller
|
|
|
'ordernum' => ['nullable', 'string'],
|
|
'ordernum' => ['nullable', 'string'],
|
|
|
'member_id' => ['nullable', 'integer'],
|
|
'member_id' => ['nullable', 'integer'],
|
|
|
'first_name' => ['nullable'],
|
|
'first_name' => ['nullable'],
|
|
|
- 'game' => ['nullable', 'string'],
|
|
|
|
|
'gameplay' => ['nullable', 'string'],
|
|
'gameplay' => ['nullable', 'string'],
|
|
|
'status' => ['nullable', 'integer'],
|
|
'status' => ['nullable', 'integer'],
|
|
|
'id' => ['nullable', 'integer'],
|
|
'id' => ['nullable', 'integer'],
|
|
@@ -52,9 +51,6 @@ class JisuGameOrder extends Controller
|
|
|
if (isset($params['status']) && $params['status'] !== null) {
|
|
if (isset($params['status']) && $params['status'] !== null) {
|
|
|
$query = $query->where('jisu_game_order.status', $params['status']);
|
|
$query = $query->where('jisu_game_order.status', $params['status']);
|
|
|
}
|
|
}
|
|
|
- if (!empty($params['game'])) {
|
|
|
|
|
- $query = $query->where('jisu_gameplay.game', 'like', '%'.$params['game'].'%');
|
|
|
|
|
- }
|
|
|
|
|
if (!empty($params['gameplay'])) {
|
|
if (!empty($params['gameplay'])) {
|
|
|
$query = $query->where('jisu_gameplay.gameplay', 'like', '%'.$params['gameplay'].'%');
|
|
$query = $query->where('jisu_gameplay.gameplay', 'like', '%'.$params['gameplay'].'%');
|
|
|
}
|
|
}
|
|
@@ -70,7 +66,7 @@ class JisuGameOrder extends Controller
|
|
|
$query = $query->where('sport_game_order.created_at', '<=', $endTime);
|
|
$query = $query->where('sport_game_order.created_at', '<=', $endTime);
|
|
|
}
|
|
}
|
|
|
$count = $query->count();
|
|
$count = $query->count();
|
|
|
- $list = $query->select('jisu_game_order.*','users.first_name','users.member_id', 'jisu_gameplay.game', 'jisu_gameplay.gameplay')
|
|
|
|
|
|
|
+ $list = $query->select('jisu_game_order.*','users.first_name','users.member_id', 'jisu_gameplay.gameplay')
|
|
|
->forPage($page, $limit)
|
|
->forPage($page, $limit)
|
|
|
->orderByDesc('jisu_game_order.created_at')
|
|
->orderByDesc('jisu_game_order.created_at')
|
|
|
->get();
|
|
->get();
|
|
@@ -92,7 +88,7 @@ class JisuGameOrder extends Controller
|
|
|
$order = JisuGameOrderModel::join('users', 'users.member_id', '=', 'jisu_game_order.member_id')
|
|
$order = JisuGameOrderModel::join('users', 'users.member_id', '=', 'jisu_game_order.member_id')
|
|
|
->join('jisu_gameplay', 'jisu_gameplay.id', '=', 'jisu_game_order.gameplay_id')
|
|
->join('jisu_gameplay', 'jisu_gameplay.id', '=', 'jisu_game_order.gameplay_id')
|
|
|
->where('jisu_game_order.id', $id)
|
|
->where('jisu_game_order.id', $id)
|
|
|
- ->select('jisu_game_order.*','users.first_name','users.member_id', 'jisu_gameplay.game', 'jisu_gameplay.gameplay')
|
|
|
|
|
|
|
+ ->select('jisu_game_order.*','users.first_name','users.member_id', 'jisu_gameplay.gameplay')
|
|
|
->first();
|
|
->first();
|
|
|
if (!$order) throw new Exception('订单不存在');
|
|
if (!$order) throw new Exception('订单不存在');
|
|
|
$order = $order->toArray();
|
|
$order = $order->toArray();
|