diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ReturnOrderDTO.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ReturnOrderDTO.java
index 953b5b78..75dc893c 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ReturnOrderDTO.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ReturnOrderDTO.java
@@ -25,7 +25,7 @@ public class ReturnOrderDTO {
     private String shopId;
     @NotEmpty
     private String note;
-    @NotEmpty
+//    @NotEmpty
     private String pwd;
     @Valid
     private List<OrderDetail> orderDetails;
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
index 832cdd6e..ffbbd69e 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
@@ -230,8 +230,13 @@ public class TbShopTableServiceImpl implements TbShopTableService {
 
             TbOrderInfo orderInfo = null;
             if (StrUtil.isNotBlank(date.getQrcode())) {
-                ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(criteria.getShopId(), date.getQrcode());
-                orderInfo = getCurrentOrder(shopEatTypeInfoDTO);
+                try {
+
+                    ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(criteria.getShopId(), date.getQrcode());
+                    orderInfo = getCurrentOrder(shopEatTypeInfoDTO);
+                }catch (Exception e) {
+                    log.info(e.getMessage());
+                }
             }
 
             itemMap.put("orderId", orderInfo == null ? null : orderInfo.getId());
@@ -2014,7 +2019,6 @@ public class TbShopTableServiceImpl implements TbShopTableService {
 
     @Override
     public Object returnOrder(ReturnOrderDTO returnOrderDTO) {
-
         TbOrderInfo orderInfo = orderInfoMapper.selectOne(new LambdaQueryWrapper<TbOrderInfo>()
                 .eq(TbOrderInfo::getId, returnOrderDTO.getOrderId())
                 .eq(TbOrderInfo::getStatus, "closed"));