From ea67a43d98ca428ed669518508843cdd9013ff9c Mon Sep 17 00:00:00 2001
From: gaorl <gaoronglin@ele-cloud.com>
Date: Wed, 3 May 2023 15:07:46 +0800
Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E9=A9=B3=E5=9B=9E=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=8B=86=E5=88=86=E6=88=96=E8=80=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4=E7=9A=84=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=B9=9F=E9=9C=80=E8=A6=81=E9=87=8D=E6=96=B0=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=B5=81=E6=B0=B4=E5=8F=B7=EF=BC=8C=E5=90=A6=E5=88=99=E8=BF=9B?=
 =?UTF-8?q?=E4=B8=8D=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/InterfaceServiceImplV6.java    | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java
index 76bfd6d3..5ee41817 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java
@@ -151,14 +151,15 @@ public class InterfaceServiceImplV6 implements InterfaceServiceV6 {
             poCommonResponseParam.setES_OUTPUT(esOutput);
             return poCommonResponseParam;
         }
-        List<OrderProcessInfo> collect = orderProcessInfos.stream().filter(t -> "0".equals(t.getOrderStatus())).collect(Collectors.toList());
-        if(collect.isEmpty()){
-            esOutput.setZMESSAGE("账单号已被删除");
-            poCommonResponseParam.setES_OUTPUT(esOutput);
-            return poCommonResponseParam;
-        }
-        List<OrderProcessInfo> collect1 = collect.stream().filter(t -> "3".equals(t.getDdly())).collect(Collectors.toList());
-        if(collect.isEmpty()){
+        //拆分或者页面逻辑删除的订单也需要重新修改流水号，否则进不来
+//        List<OrderProcessInfo> collect = orderProcessInfos.stream().filter(t -> "0".equals(t.getOrderStatus())).collect(Collectors.toList());
+//        if(collect.isEmpty()){
+//            esOutput.setZMESSAGE("账单号已被删除");
+//            poCommonResponseParam.setES_OUTPUT(esOutput);
+//            return poCommonResponseParam;
+//        }
+        List<OrderProcessInfo> collect1 = orderProcessInfos.stream().filter(t -> "3".equals(t.getDdly())).collect(Collectors.toList());
+        if(orderProcessInfos.isEmpty()){
             esOutput.setZMESSAGE("此账单为非接口数据，不允许驳回");
             poCommonResponseParam.setES_OUTPUT(esOutput);
             return poCommonResponseParam;