u

app/Http/Controllers/api/Issue.php

@@ -93,8 +93,9 @@ class Issue extends BaseController
         $data2 = \App\Models\Issue::where('status', 3)->orderByDesc('issue_no')->first();
 
         $issue_no2 = $data2->issue_no + 1;
-        $data1 = \App\Models\Issue::where('issue_no', $issue_no2)->orderByDesc('issue_no')->first();
-
+        $issue_no2 .= '';
+        $data1 = \App\Models\Issue::where('issue_no', $issue_no2)->first();
+        $end_time = $data1 ? strtotime($data1->end_time) : (bcadd(strtotime($data2->end_time), 210, 0));
 
         $winnings = explode(',', $data2->winning_numbers);
         $winnings = array_map('intval', $winnings);
@@ -108,12 +109,14 @@ class Issue extends BaseController
         $arr['odd_or_even'] = in_array('单', $award) ? '单' : "双";
         $arr['issue_no'] = $data2->issue_no;
         $data = [
-            'issue_no' => $issue_no2.'',
+            'issue_no' => $issue_no2,
             'current_time' => time(),
-            'end_time' => $data1 ? strtotime($data1->end_time) : (bcadd(strtotime($data2->end_time),210,0)),
-
+            'end_time' => $end_time,
 //            'winnings' => $arr,
         ];
+        if ($data['end_time'] < $data['current_time']) {
+            $data['end_time'] += 210;
+        }
         $data['aa'] = $data['end_time'] - $data['current_time'];
         $data['winnings'] = $arr;
         return $this->success($data);