From a1f1ff3f942136f848ff56554ca83335354fa385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Mon, 16 Dec 2024 17:18:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BD=AC=E6=A1=8C=E4=BF=AE=E5=A4=8D=20?= =?UTF-8?q?=E4=B8=8D=E6=89=93=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/product/TbPlaceController.java | 2 +- .../impl/shopimpl/TbShopTableServiceImpl.java | 20 +++++++++---------- .../service/shop/TbShopTableService.java | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java index 089a7c0f..2af78c76 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java @@ -160,7 +160,7 @@ public class TbPlaceController { @ApiOperation("代客下单 查询购物车 /shop/table") public ResponseEntity createOrder(HttpServletRequest request, @RequestBody CreateOrderDTO createOrderDTO) { Utils.checkLimit(tokenProvider.getToken(request), 1, 400); - return ResponseEntity.ok(tbShopTableService.createOrder(createOrderDTO, false)); + return ResponseEntity.ok(tbShopTableService.createOrder(createOrderDTO, false, true)); } @PostMapping("/pending") 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 19831bb7..a6682883 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 @@ -1287,7 +1287,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { @Override @Transactional - public TbOrderInfo createOrder(CreateOrderDTO createOrderDTO, boolean byOrderId) { + public TbOrderInfo createOrder(CreateOrderDTO createOrderDTO, boolean byOrderId, boolean isPrint) { createOrderDTO.setTableId(OrderUseTypeEnum.TAKEOUT.getValue().equals(createOrderDTO.getUseType()) ? null : createOrderDTO.getTableId()); return Utils.runFunAndCheckKey(() -> { TbShopUser shopUser = null; @@ -1328,7 +1328,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { orderInfo, cartInfoDTO.getSeatCart(), shopUser, shopTable, createOrderDTO.getIsWaitCall()); // 修改订单详情并打票 - updateDetailAndPrint(orderInfo, detailPriceDTO, shopEatTypeInfoDTO); + updateDetailAndPrint(orderInfo, detailPriceDTO, shopEatTypeInfoDTO, isPrint); // 修改购物车状态和库存 updateCartAndStock(cartInfoDTO.getNewCashierCarts(), orderInfo, shopEatTypeInfoDTO); @@ -1800,7 +1800,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { return orderInfo; } - private void updateDetailAndPrint(TbOrderInfo orderInfo, OrderPriceDTO priceDTO, ShopEatTypeInfoDTO shopEatTypeInfoDTO) { + private void updateDetailAndPrint(TbOrderInfo orderInfo, OrderPriceDTO priceDTO, ShopEatTypeInfoDTO shopEatTypeInfoDTO, boolean isPrint) { // 添加订单详细数据 Integer orderId = orderInfo.getId(); for (TbOrderDetail orderDetail : priceDTO.getOrderDetailList()) { @@ -1815,14 +1815,14 @@ public class TbShopTableServiceImpl implements TbShopTableService { } // 菜品票 - if (!priceDTO.getNewOrderDetailList().isEmpty() && shopEatTypeInfoDTO.isDineInAfter()) { + if (!priceDTO.getNewOrderDetailList().isEmpty() && shopEatTypeInfoDTO.isDineInAfter() && isPrint) { rabbitMsgUtils.printDishesTicket(orderInfo.getId(), false, priceDTO.getNewOrderDetailList().toArray(new TbOrderDetail[0])); } if (!priceDTO.getRemoveOrderDetailIds().isEmpty()) { // 退单票 orderDetailMapper.deleteBatchIds(priceDTO.getRemoveOrderDetailIds()); - if (shopEatTypeInfoDTO.isDineInAfter()) { + if (shopEatTypeInfoDTO.isDineInAfter() && isPrint) { rabbitMsgUtils.printDishesTicket(orderInfo.getId(), true, priceDTO.getRemoveOrderDetailList().toArray(new TbOrderDetail[0])); } } @@ -2021,7 +2021,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { createOrderDTO.setMasterId(pendingDTO.getMasterId()); createOrderDTO.setNote(pendingDTO.getNote()); createOrderDTO.setUseType(pendingDTO.getUseType()); - orderId = createOrder(createOrderDTO, false).getId(); + orderId = createOrder(createOrderDTO, false, true).getId(); } @@ -2597,7 +2597,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { } if (dto != null) { dto.setVipUserId(updateVipDTO.getType() == 0 ? updateVipDTO.getVipUserId() : null); - return createOrder(dto, true); + return createOrder(dto, true, true); } return "哈哈哈"; @@ -3464,14 +3464,14 @@ public class TbShopTableServiceImpl implements TbShopTableService { mpOrderInfoService.removeById(orderId); } - if (!switchTableDTO.isFull() && switchTableDTO.getCartIds().size() != totalSize) { + if (!switchTableDTO.isFull() && switchTableDTO.getCartIds().size() == totalSize) { // 重新创建订单数据 CreateOrderDTO createOrderDTO = new CreateOrderDTO(); createOrderDTO.setMasterId(switchTableDTO.getMasterId()); createOrderDTO.setShopId(switchTableDTO.getShopId()); createOrderDTO.setTableId(switchTableDTO.getCurrentTableId()); createOrderDTO.setUseType(shopEatTypeInfoDTO.getUseType()); - createOrder(createOrderDTO, false); + createOrder(createOrderDTO, false, false); } // 重新创建订单数据 @@ -3480,7 +3480,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { createOrderDTO.setShopId(switchTableDTO.getShopId()); createOrderDTO.setTableId(switchTableDTO.getTargetTableId()); createOrderDTO.setUseType(targetShopEatTypeInfoDTO.getUseType()); - createOrder(createOrderDTO, false); + createOrder(createOrderDTO, false, false); return true; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java index 4d194042..a40364e5 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java @@ -117,7 +117,7 @@ public interface TbShopTableService { void pack(PackCartDTO packCartDTO); - Object createOrder(CreateOrderDTO createOrderDTO, boolean addMasterId); + Object createOrder(CreateOrderDTO createOrderDTO, boolean addMasterId, boolean isPrint); JSONObject getMasterId(Integer shopId, String tableId, String useType, Integer orderId);