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()