From f91b7e25fde8e1531e853eb79bba27485965ee87 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Tue, 15 Oct 2024 16:46:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=AE=A2=E5=8D=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/CartService.java             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
index f2a62b0..32c50c8 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -1129,7 +1129,8 @@ public class CartService {
                 }
                 cashierCart.setUpdatedAt(System.currentTimeMillis());
                 cashierCart.setOrderId(orderId + "");
-                if (!TableConstant.CART_SEAT_ID.equals(cashierCart.getProductId()) || shopEatTypeInfoDTO.isDineInBefore()) {
+                if ((!TableConstant.CART_SEAT_ID.equals(cashierCart.getProductId()) && !shopEatTypeInfoDTO.isDineInAfter())
+                        || shopEatTypeInfoDTO.isDineInBefore()) {
                     cashierCart.setStatus("closed");
                 }
                 cashierCart.setPlaceNum(cashierCart.getPlaceNum() == null ? currentPlaceNum : cashierCart.getPlaceNum());