From 875c61adb67a066fd1b8c7567b723121ffb0cf9e Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 30 Mar 2026 18:10:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8D=95=E5=AD=90=20?=
 =?UTF-8?q?=E6=B8=85=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/OrderInfoCustomServiceImpl.java     | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
index 894c03563..c931fabca 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
@@ -1690,6 +1690,18 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
             orderInfoService.updateById(new OrderInfo().setId(orderId)
                     .setStatus(OrderStatusEnums.CANCELLED.getCode())
                     .setOriginAmount(BigDecimal.ZERO));
+            ShopTable table = shopTableService.getOneByTableCode(orderInfo.getShopId(), orderInfo.getTableCode());
+            if (table != null) {
+                ShopInfo shopInfo = shopInfoService.getById(orderInfo.getShopId());
+                if ("auto".equals(shopInfo.getTableClearType())) {
+                    table.setStatus(ShopTableStatusEnum.IDLE.getValue());
+                } else {
+                    DateTime dateTime = DateUtil.offsetMinute(DateUtil.date(), shopInfo.getTableClearTime());
+                    table.setCreateTime(LocalDateTimeUtil.of(dateTime));
+                    redisService.set(RedisCst.classKeyExpired.EXPIRED_TABLE + table.getId(), "", 60L * shopInfo.getTableClearTime());
+                }
+                shopTableService.updateById(table);
+            }
             return true;
         } else {
             BigDecimal totalAmount = BigDecimal.ZERO;