From 600753d3328c41828cf18bf7bca38401ff4d2e83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Tue, 11 Nov 2025 15:50:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=B8=85=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/impl/OrderInfoServiceImpl.java | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
index 60b11b976..b2a61ba20 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
@@ -1608,6 +1608,22 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 .update();
         redisService.del(RedisCst.classKeyExpired.EXPIRED_ORDER + orderInfo.getId());
         rabbitPublisher.sendOrderCancelMsg(orderInfo.getId().toString());
+
+        // 还原台桌状态
+        if (StrUtil.isNotBlank(orderInfo.getTableCode())) {
+            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;
     }