From 2cbf160c4b718c185effc5a45f5204ea701e1fee Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Mon, 14 Oct 2024 09:02:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=AE=A2=E5=8D=95=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/OrderService.java          | 5 +++++
 .../system/cashierservice/service/PayService.java            | 2 ++
 2 files changed, 7 insertions(+)

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 0311078..7779af2 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -783,6 +783,11 @@ public class OrderService {
                 cashierCart.setPlaceNum(currentPlaceNum);
             }
 
+            // 先付费模式，结束购物车状态
+            if (eatTypeInfoDTO.isDineInBefore() || eatTypeInfoDTO.isTakeout()) {
+                cashierCart.setStatus("final");
+            }
+
             TbOrderDetail orderDetail = null;
             if (StrUtil.isNotBlank(cashierCart.getOrderId())) {
                 orderDetail = oldOrderDetailMap.get(cashierCart.getOrderId() + cashierCart.getId());
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
index cd3a9dd..78082ca 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -338,6 +338,7 @@ public class PayService {
                         orderInfo.setStatus("paying");
                         orderInfo.setPayOrderNo(payment.getTradeNumber());
                         tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);
+                        int cartCount = tbCashierCartMapper.updateByOrderId(orderId, "final");
 
                         payment.setUpdatedAt(System.currentTimeMillis());
                         tbOrderPaymentMapper.updateByPrimaryKeySelective(payment);
@@ -429,6 +430,7 @@ public class PayService {
                         orderInfo.setStatus("paying");
                         orderInfo.setPayOrderNo(payment.getTradeNumber());
                         tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);
+                        int cartCount = tbCashierCartMapper.updateByOrderId(orderId, "final");
 
 
                         payment.setUpdatedAt(System.currentTimeMillis());