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 collect = orderProcessInfos.stream().filter(t -> "0".equals(t.getOrderStatus())).collect(Collectors.toList()); - if(collect.isEmpty()){ - esOutput.setZMESSAGE("账单号已被删除"); - poCommonResponseParam.setES_OUTPUT(esOutput); - return poCommonResponseParam; - } - List collect1 = collect.stream().filter(t -> "3".equals(t.getDdly())).collect(Collectors.toList()); - if(collect.isEmpty()){ + //拆分或者页面逻辑删除的订单也需要重新修改流水号,否则进不来 +// List collect = orderProcessInfos.stream().filter(t -> "0".equals(t.getOrderStatus())).collect(Collectors.toList()); +// if(collect.isEmpty()){ +// esOutput.setZMESSAGE("账单号已被删除"); +// poCommonResponseParam.setES_OUTPUT(esOutput); +// return poCommonResponseParam; +// } + List collect1 = orderProcessInfos.stream().filter(t -> "3".equals(t.getDdly())).collect(Collectors.toList()); + if(orderProcessInfos.isEmpty()){ esOutput.setZMESSAGE("此账单为非接口数据,不允许驳回"); poCommonResponseParam.setES_OUTPUT(esOutput); return poCommonResponseParam;