From 0552e5d5d5ca0a3beb92a7196181e5afede304a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E8=8D=A3=E7=90=B3?= <gaoronglin@ele-cloud.com>
Date: Tue, 19 Sep 2023 17:14:01 +0800
Subject: [PATCH] =?UTF-8?q?feature:=E8=A1=A5=E5=BD=95=E6=8A=A5=E8=B4=A6?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/order/service/impl/OrderInfoServiceImpl.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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<OrderProcessInfo> orderProcessInfos = orderProcessInfoMapper.queryOrderProcessInfoByBzdh(bzdh,"", Arrays.asList(xhfNsrsbh));
         OrderProcessInfo orderProcessInfo = null;
-        if(orderProcessInfos.size() > 1){
+        List<OrderProcessInfo> 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();