|
@@ -171,7 +171,11 @@ class Order extends Controller
|
|
|
'order_id' => ['required', 'string'],
|
|
'order_id' => ['required', 'string'],
|
|
|
]);
|
|
]);
|
|
|
$order_id = request()->input('order_id');
|
|
$order_id = request()->input('order_id');
|
|
|
- $order = OrderModel::where('order_id', $order_id)->first();
|
|
|
|
|
|
|
+ $order = OrderModel::join('sport_odds', 'sport_odds.odd_name_en', '=', 'sport_order.odd_name')
|
|
|
|
|
+ ->join('sport', 'sport.data_id', '=', 'sport_order.issue')
|
|
|
|
|
+ ->where('sport_order.order_id', $order_id)
|
|
|
|
|
+ ->select(['sport_order.*','sport_odds.odd_name as odd_name', 'sport.league', 'sport.league_en', 'sport.home_team', 'sport.home_team_en', 'sport.guest_team', 'sport.guest_team_en'])
|
|
|
|
|
+ ->first();
|
|
|
if (!$order) throw new Exception('订单不存在');
|
|
if (!$order) throw new Exception('订单不存在');
|
|
|
$order = $order->toArray();
|
|
$order = $order->toArray();
|
|
|
$order['game_result'] = $order['game_result'] ? json_decode($order['game_result'],true) : null;
|
|
$order['game_result'] = $order['game_result'] ? json_decode($order['game_result'],true) : null;
|
|
@@ -179,11 +183,7 @@ class Order extends Controller
|
|
|
$order['odd_name'] = Sport::doOddName($order['odd_name']);
|
|
$order['odd_name'] = Sport::doOddName($order['odd_name']);
|
|
|
$order['odd_value'] = Sport::doOddValue($order['odd_value']);
|
|
$order['odd_value'] = Sport::doOddValue($order['odd_value']);
|
|
|
$order['odd'] = formatDecimal($order['odd'], 2);
|
|
$order['odd'] = formatDecimal($order['odd'], 2);
|
|
|
- if (!empty($order['detail']['game_time'])) {
|
|
|
|
|
- $order['detail']['game_time'] = date('Y-m-d H:i:s', $order['detail']['game_time']);
|
|
|
|
|
- } else {
|
|
|
|
|
- $order['detail']['game_time'] = '';
|
|
|
|
|
- }
|
|
|
|
|
|
|
+
|
|
|
if (!empty($order['detail']['fixture_status'])) {
|
|
if (!empty($order['detail']['fixture_status'])) {
|
|
|
$order['detail']['fixture_status'] = Sport::getFixtureStatus($order['detail']['fixture_status']);
|
|
$order['detail']['fixture_status'] = Sport::getFixtureStatus($order['detail']['fixture_status']);
|
|
|
}
|
|
}
|