From 3caef07928da36134b5520f9f3e6a0ecdb23b84b Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Sat, 28 Sep 2024 13:29:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E9=80=BB=E8=BE=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/service/CartService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java index 8dd3865..c97f5fa 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java @@ -726,6 +726,7 @@ public class CartService { // 查询历史orderDetail Integer finalOrderId = orderId; List oldOrderDetailList = mpOrderDetailMapper.selectList(new LambdaQueryWrapper() + .eq(TbOrderDetail::getStatus, "unpaid") .and(q -> q.in(TbOrderDetail::getCartId, cashierIds).or().eq(TbOrderDetail::getOrderId, finalOrderId)) .eq(TbOrderDetail::getShopId, shopId)); HashMap oldOrderDetailMap = new HashMap<>(); @@ -734,7 +735,7 @@ public class CartService { oldOrderDetailList.forEach(item -> { oldOrderDetailMap.put(item.getOrderId().toString() + item.getCartId(), item); - if (cashierCartList.contains(item.getCartId())) { + if (cashierIds.contains(item.getCartId())) { oldOrderDetailMap.put(item.getOrderId().toString() + item.getCartId(), item); } else { removeOrderDetailList.add(item); @@ -1052,12 +1053,14 @@ public class CartService { // 打印票据 if (!addOrderDetail.isEmpty() && shopEatTypeInfoDTO.isDineInAfter()) { + log.info("待打印菜品信息: {}", addOrderDetail); mQUtils.printDishesTicket(orderInfo.getId(), false, addOrderDetail.toArray(new TbOrderDetail[0])); } if (!removeOrderDetailList.isEmpty()) { + log.info("待打印退菜菜品信息: {}", removeOrderDetailList); // 退单票 - mpOrderDetailMapper.deleteBatchIds(removeOrderDetailList.stream().map(tbOrderDetail -> tbOrderDetail.getId()).collect(Collectors.toList())); + mpOrderDetailMapper.deleteBatchIds(removeOrderDetailList.stream().map(TbOrderDetail::getId).collect(Collectors.toList())); if (shopEatTypeInfoDTO.isDineInAfter()) { mQUtils.printDishesTicket(orderInfo.getId(), true, removeOrderDetailList.toArray(new TbOrderDetail[0])); }