From 68a8f6d3c53af6cf0fcfac3f6c805098da936618 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Thu, 7 Nov 2024 11:07:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8F=AA=E9=80=89=E6=8B=A9=E9=A4=90?=
 =?UTF-8?q?=E4=BD=8D=E8=B4=B9=E4=B8=8D=E5=85=81=E8=AE=B8=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/bean/constant/TableConstant.java     | 3 +++
 .../system/cashierservice/service/OrderService.java            | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/bean/constant/TableConstant.java b/src/main/java/com/chaozhanggui/system/cashierservice/bean/constant/TableConstant.java
index 81b21c8..672e01e 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/bean/constant/TableConstant.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/bean/constant/TableConstant.java
@@ -42,6 +42,9 @@ public interface TableConstant {
             Status(String value) {
                 this.value = value;
             }
+            public boolean equalsVals(String value) {
+                return this.value.equals(value);
+            }
         }
 
         @Getter
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
index a9560f0..27b212c 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -783,7 +783,7 @@ public class OrderService {
                 .eq(TbCashierCart::getUseType, eatTypeInfoDTO.getUseType())
                 .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime())
                 .and(q -> q.eq(TbCashierCart::getMasterId, orderVo.getMasterId()).or().isNull(TbCashierCart::getMasterId))
-                .eq(TbCashierCart::getStatus, "create");
+                .in(TbCashierCart::getStatus, "create", "return");
 
         // 外带模式
         if (eatTypeInfoDTO.isTakeout()) {
@@ -838,6 +838,7 @@ public class OrderService {
             return Result.fail("请选择用餐人数");
         }
 
+        list = list.stream().filter(item -> TableConstant.OrderInfo.Status.CREATE.equalsVals(item.getStatus())).collect(Collectors.toList());
         if (eatTypeInfoDTO.isNeedSeatFee() && list.size() < 2) {
             return Result.fail("购物车为空");
         }