From 857502e26ee1231bccfe02578054b4f1eaeaca2c Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Fri, 11 Oct 2024 16:42:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=88=E4=BB=98=E8=B4=B9=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=AE=A2=E5=8D=95=E4=B9=8B=E5=90=8E=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E8=B4=AD=E7=89=A9=E8=BD=A6=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/shopimpl/TbShopTableServiceImpl.java       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
index 037eadee..6b55210f 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
@@ -1205,7 +1205,6 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                 String orderNo = generateOrderNumber(null);
                 orderInfo = new TbOrderInfo();
                 orderInfo.setOrderNo(orderNo);
-                orderInfo.setUseType(createOrderDTO.isPostPay() ? "postPay" : "afterPay");
                 orderInfo.setAmount(totalAmount);
                 orderInfo.setPayAmount(BigDecimal.ZERO);
                 orderInfo.setPackFee(packAMount);
@@ -1286,6 +1285,11 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                 if (cashierCart.getPlaceNum() == null) {
                     cashierCart.setPlaceNum(placeNum);
                 }
+
+                // 先付费模式，结束购物车状态
+                if (shopEatTypeInfoDTO.isDineInBefore()) {
+                    cashierCart.setStatus("final");
+                }
                 cashierCartMapper.updateById(cashierCart);
             }