From cd1e5c2cd06674f3446b79c9699e4ef7d60f1ade Mon Sep 17 00:00:00 2001 From: HUANGBANGLIN Date: Fri, 3 Oct 2025 16:04:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=82=E5=8D=95=E7=BB=BC=E5=90=88=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/App_Code/api/guadanOrderController.cs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/web/App_Code/api/guadanOrderController.cs b/web/App_Code/api/guadanOrderController.cs index b3966af..497ce3d 100644 --- a/web/App_Code/api/guadanOrderController.cs +++ b/web/App_Code/api/guadanOrderController.cs @@ -69,15 +69,18 @@ public class guadanOrderController : ApiController .Where(c => c.RegionRoomBedStatus.Code != GuaDanOrderGuest.STATUS_CANCELLED) .Count(), statusName = _db.GuaDanOrderGuest - .Where(g => g.GuaDanOrderNo == a.GuaDanOrderNo) - .All(g => g.StatusCode == "404") ? "預約" : + .Where(g => g.GuaDanOrderNo == a.GuaDanOrderNo && a.IsDeleted == false) + .Where(g => g.StatusCode != GuaDanOrderGuest.STATUS_CANCELLED) + .All(g => g.StatusCode == "401") ? "預約" : _db.GuaDanOrderGuest - .Where(g => g.GuaDanOrderNo == a.GuaDanOrderNo) + .Where(g => g.GuaDanOrderNo == a.GuaDanOrderNo && a.IsDeleted == false) + .Where(g => g.StatusCode != GuaDanOrderGuest.STATUS_CANCELLED) .All(g => g.StatusCode == "403") ? "全部退房" : _db.GuaDanOrderGuest - .Where(g => g.GuaDanOrderNo == a.GuaDanOrderNo) - .Any(g => g.StatusCode == "401") ? "正在入住" : - "混合狀態" + .Where(g => g.GuaDanOrderNo == a.GuaDanOrderNo && a.IsDeleted == false) + .Where(g => g.StatusCode != GuaDanOrderGuest.STATUS_CANCELLED) + .Any(g => g.StatusCode == "402" && a.IsCancel == false) ? "正在入住" : + "部分退房" }) .Skip((search.page - 1) * search.pageSize) .Take(search.pageSize)