From 655383fd0246a184f25e5e1cba1e7f7409474e65 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Sun, 29 Sep 2024 11:35:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=AC=BE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/ysk/cashier/dto/shoptable/ReturnOrderDTO.java | 2 +- .../service/impl/shopimpl/TbShopTableServiceImpl.java | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) 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 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() .eq(TbOrderInfo::getId, returnOrderDTO.getOrderId()) .eq(TbOrderInfo::getStatus, "closed"));