lip 21 часов назад
Родитель
Сommit
f614124fe4
1 измененных файлов с 14 добавлено и 3 удалено
  1. 14 3
      app/Http/Controllers/admin/Order.php

+ 14 - 3
app/Http/Controllers/admin/Order.php

@@ -155,12 +155,12 @@ class Order extends Controller
                 $item['odd_value'] = Sport::doOddValue($item['odd_value']);
                 $item['odd'] = formatDecimal($item['odd'], 2);
                 if (!empty($item['detail']['game_time'])) {
-                    $item['game_time'] = date('Y-m-d H:i:s', $item['detail']['game_time']);
+                    $item['detail']['game_time'] = date('Y-m-d H:i:s', $item['detail']['game_time']);
                 } else {
-                    $item['game_time'] = '';
+                    $item['detail']['game_time'] = '';
                 } 
                 if (!empty($item['detail']['fixture_status'])) {
-                    $item['fixture_status'] = Sport::doOddValue($item['odd_value']);
+                    $item['detail']['fixture_status'] = Sport::getFixtureStatus($item['detail']['fixture_status']);
                 } 
             }
         } catch (Exception $e) {
@@ -183,6 +183,17 @@ class Order extends Controller
             $order = $order->toArray();
             $order['game_result']  = $order['game_result'] ? json_decode($order['game_result'],true) : null;
             $order['first_name'] = User::where('user_id', $order['user_id'])->value('first_name');
+            $order['odd_name'] = Sport::doOddName($order['odd_name']);
+            $order['odd_value'] = Sport::doOddValue($order['odd_value']);
+            $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'])) {
+                $order['detail']['fixture_status'] = Sport::getFixtureStatus($order['detail']['odd_value']);
+            } 
             ksort($order);
         } catch (Exception $e) {
             return $this->error(HttpStatus::CUSTOM_ERROR,$e->getMessage());