From 9fa00657a823bb27b782e5b9dc0cad52adee75b2 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Fri, 19 May 2023 16:59:10 +0800 Subject: [PATCH] =?UTF-8?q?feature=201.=E8=BF=94=E5=9B=9E=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E7=9A=84=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AllocateInvoiceInterfaceServiceImplV3.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java index d07e89dd..d69a7544 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java @@ -1253,7 +1253,12 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt if(processInfos != null && !processInfos.isEmpty()){ //证明是拆分的订单 List invalidList = orderInvoiceInfoService.countInoviceInfo(processInfos.stream().map(OrderProcessInfo::getOrderInfoId).collect(Collectors.toList())); - if(invalidList != null && !invalidList.isEmpty() && invalidList.size() != processInfos.size()){ + List infos = processInfos.stream().filter(p -> (OrderInfoEnum.ORDER_STATUS_5.getKey().equals(p.getDdzt()) || OrderInfoEnum.ORDER_STATUS_7.getKey().equals(p.getDdzt()))).collect(Collectors.toList()); + if(infos != null && infos.size() == processInfos.size()){ + log.error("{}证明是拆分的订单 已开票/已冲红,请求流水号已存在!订单ID为:{},流水号为:{}", LOGGER_MSG, selectOrderProcessInfo.getOrderInfoId(), ddqqlsh); + throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_ERROR_CODE_010002_V3); + } + if(invalidList != null && invalidList.size() == processInfos.size()){ log.error("{}证明是拆分的订单,请求流水号已存在!订单ID为:{},流水号为:{}", LOGGER_MSG, selectOrderProcessInfo.getOrderInfoId(), ddqqlsh); throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_ERROR_CODE_010002_V3); }