diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index 86c1c452..0c5233c4 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java @@ -1756,11 +1756,12 @@ public class OrderInfoServiceImpl implements OrderInfoService { //通过报账单查询订单,如果存在则删除 List orderProcessInfos = orderProcessInfoMapper.queryOrderProcessInfoByBzdh(bzdh,"", Arrays.asList(xhfNsrsbh)); OrderProcessInfo orderProcessInfo = null; - if(orderProcessInfos.size() > 1){ + List orderProcessInfoList = orderProcessInfos.stream().filter(t -> OrderInfoEnum.ORDER_STATUS_0.getKey().equals(t.getDdzt())).collect(Collectors.toList()); + if(orderProcessInfoList.size() > 1){ throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_BZDH_MULTIPLE); } - if(orderProcessInfos.size() == 1){ - orderProcessInfo = orderProcessInfos.get(0); + if(orderProcessInfoList.size() == 1){ + orderProcessInfo = orderProcessInfoList.get(0); } if(orderProcessInfo != null){ @@ -1782,7 +1783,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { OrderProcessInfo orderProcessInfo2 = new OrderProcessInfo(); orderProcessInfo2.setBzdh(bzdh); orderProcessInfo2.setOrderInfoId(orderInfoId); - orderProcessInfo2.setXtly(orderProcessInfo != null && StringUtils.isNotBlank(orderProcessInfo.getXtly()) ? orderProcessInfo.getXtly() : ""); + orderProcessInfo2.setXtly(orderProcessInfo != null && StringUtils.isNotBlank(orderProcessInfo.getXtly()) ? orderProcessInfo.getXtly() : orderProcessInfos.size() > 0 && StringUtils.isNotBlank(orderProcessInfos.get(0).getXtly())?orderProcessInfos.get(0).getXtly():""); int i = orderProcessInfoMapper.updateOrderProcessInfoByFpqqlsh(orderProcessInfo2, Arrays.asList(xhfNsrsbh)); if(i > 0) { Map map = new HashMap();