From 2154ebae15aff2a9af21de5edd314c9d8a876141 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 21 Oct 2025 11:22:38 +0800
Subject: [PATCH] =?UTF-8?q?0=E5=85=83=E6=94=AF=E4=BB=98=20=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E6=88=90=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/exception/CzgControllerAdvice.java | 2 +-
 .../czg/service/order/service/impl/OrderInfoServiceImpl.java | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java b/cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java
index e3db720b9..9d345ade0 100644
--- a/cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java
+++ b/cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java
@@ -108,7 +108,7 @@ public class CzgControllerAdvice {
      */
     @ExceptionHandler(PaySuccessException.class)
     public CzgResult<Object> handlePaySuccessException() {
-        return CzgResult.success();
+        return CzgResult.success("支付成功");
     }
 
     /**
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 8fb0f88db..55474aa50 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
@@ -218,9 +218,12 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
 
     @Override
     public HistoryOrderVo historyOrder(Long orderId, String tableCode) {
-        if (orderId == null && StrUtil.isBlank(tableCode)) {
+        if (orderId == null || StrUtil.isBlank(tableCode)) {
             throw new ValidateException("订单id或台桌码不可为空");
         }
+        if("null".equals(tableCode) || "undefined".equals(tableCode)){
+            throw new ValidateException("台桌码不可用");
+        }
         HistoryOrderVo historyOrderVo;
         if (orderId == null) {
             historyOrderVo = queryChain()