From db14a05e7212d5cffc7c653526fca8fef6a1ef4d Mon Sep 17 00:00:00 2001 From: sa0ChunLuyu Date: Tue, 21 Jan 2025 19:01:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E4=BD=93=E6=A3=80?= =?UTF-8?q?=E5=BC=95=E5=AF=BC=20=E6=9C=AA=E7=99=BB=E8=AE=B0=20=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/API/H5/FenzhenController.php | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php index e24b418..63f11e7 100644 --- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php +++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php @@ -135,21 +135,23 @@ class FenzhenController extends Controller $push_end = false; foreach ($clinics as $item) { if (!in_array($item['keshi_id'], $clinic_map)) { + if(count($end_queue) == 0) { $push_end = true; $item_count = $item['count']; $in_time = date('H:i', $last_time); - $time_line = array_merge(array_splice($time_line, 0, count($time_line) - 1), [ - [ - "desc" => "预计 $in_time 进入队列", - "more" => 0, - "name" => $item['name'], - "status" => 1, - 'count' => -1, - "time" => "$in_time", - "tip" => "剩余{$item_count}项正在排队中，" - ] - ], [$time_line[count($time_line) - 1]]); - $last_time = $last_time + (60 * 5); + $time_line = array_merge(array_splice($time_line, 0, count($time_line) - 1), [ + [ + "desc" => "预计 $in_time 进入队列", + "more" => 0, + "name" => $item['name'], + "status" => 1, + 'count' => -1, + "time" => "$in_time", + "tip" => "剩余{$item_count}项正在排队中，" + ] + ], [$time_line[count($time_line) - 1]]); + $last_time = $last_time + (60 * 5); + } } } if ($push_end) { From f16b5b6384cd55202517bae8ef79613cfe9deed9 Mon Sep 17 00:00:00 2001 From: sa0ChunLuyu Date: Tue, 21 Jan 2025 19:05:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E4=BD=93=E6=A3=80?= =?UTF-8?q?=E5=BC=95=E5=AF=BC=20=E6=9C=AA=E7=99=BB=E8=AE=B0=20=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Laravel/app/Http/Controllers/API/H5/FenzhenController.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php index 63f11e7..e5fb378 100644 --- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php +++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php @@ -135,7 +135,6 @@ class FenzhenController extends Controller $push_end = false; foreach ($clinics as $item) { if (!in_array($item['keshi_id'], $clinic_map)) { - if(count($end_queue) == 0) { $push_end = true; $item_count = $item['count']; $in_time = date('H:i', $last_time); @@ -151,7 +150,6 @@ class FenzhenController extends Controller ] ], [$time_line[count($time_line) - 1]]); $last_time = $last_time + (60 * 5); - } } } if ($push_end) {