From 2af6d62737bc0289198432127674006c72382756 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Fri, 13 Sep 2024 10:08:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A3=9E=E9=B9=85=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=9C=BA=E6=89=93=E5=8D=B0=E8=8F=9C=E5=93=81=E5=B0=8F=E7=A5=A8?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=BD=BF=E7=94=A8=E7=B1=BB=E5=9E=8B=E5=8C=BA?= =?UTF-8?q?=E5=88=86type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/rabbit/PrintMechineConsumer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java index a60b8a0..e867773 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/rabbit/PrintMechineConsumer.java @@ -674,7 +674,9 @@ public class PrintMechineConsumer { break; case "one": //一菜一品 - if (!orderInfo.getStatus().equals("unpaid")) { + if (orderInfo.getPayType() != null + && "postPay".equals(orderInfo.getPayType()) + && !orderInfo.getStatus().equals("unpaid")) { return; } From 4ee6999b167dd5330d102d24f66097e94361c2a5 Mon Sep 17 00:00:00 2001 From: yijiegong Date: Sun, 15 Sep 2024 19:26:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=80=97=E6=9D=90=E6=B6=88=E8=80=97=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=20=E4=B8=8D=E7=AE=A1=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E5=BA=93=E5=AD=98=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/service/ConsService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ConsService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ConsService.java index 879a464..546ab2b 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ConsService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ConsService.java @@ -66,8 +66,8 @@ public class ConsService { List consInfoFlows=new ArrayList<>(); for (TbOrderDetail orderDetail : orderDetails) { -// List proskuCons= tbProskuConMapper.selectByShopIdAndSkuIdAndProductId(orderDetail.getProductSkuId(),orderDetail.getShopId(),orderDetail.getProductId()); - List proskuCons= tbProskuConMapper.selectByShopIdAndSkuIdAndProductIdAndCheck(orderDetail.getProductSkuId(),orderDetail.getShopId(),orderDetail.getProductId()); + List proskuCons= tbProskuConMapper.selectByShopIdAndSkuIdAndProductId(orderDetail.getProductSkuId(),orderDetail.getShopId(),orderDetail.getProductId()); +// List proskuCons= tbProskuConMapper.selectByShopIdAndSkuIdAndProductIdAndCheck(orderDetail.getProductSkuId(),orderDetail.getShopId(),orderDetail.getProductId()); if(Objects.isNull(proskuCons)||proskuCons.size()<=0){ log.info("耗材信息未配置或未开启校验:orderId:{},skuId:{},shopId:{},productId:{}",orderDetail.getOrderId(),orderDetail.getProductSkuId(),orderDetail.getShopId(),orderDetail.getProductId()); continue;