From a82c3b2c1e952cfb79ffd655d9e8d614ef291930 Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 15 Aug 2023 15:11:39 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E5=BC=80=E7=A5=A8=E4=BD=9C?= =?UTF-8?q?=E5=BA=9F=E5=86=B2=E7=BA=A2=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrderInfoServiceImpl.java | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 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 a38d811b..13309d15 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 @@ -2160,7 +2160,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { int count = (int)orderProcessInfos1.stream() .filter(t -> OrderInfoEnum.ORDER_STATUS_5.getKey().equals(t.getDdzt()) || OrderInfoEnum.ORDER_STATUS_7.getKey().equals(t.getDdzt())).count(); if(orderProcessInfos1.size() != count){ - sb1.append("本次作废存在商旅发票,存在未开具成功报账单:" + s); + sb1.append(String.format("本次作废存在商旅发票,报账单:%s存在未开具成功的结算单;",s)); continue; } fpqqlsh.addAll(orderProcessInfos1.stream().map(t -> t.getFpqqlsh()).collect(Collectors.toList())); @@ -2174,7 +2174,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { List invoiceInfos = orderInvoiceInfoMapper.selectInvoiceInfoByFpqqlshs(fpqqlsh); List collect2 = invoiceInfos.stream().filter(t -> !paramList.contains(t.getFpqqlsh())).map(t -> t.getFphm()).collect(Collectors.toList()); if(!collect2.isEmpty()){ - return R.error("本次作废存在商旅发票，以下发票号码未作废:" + collect2.stream().collect(Collectors.joining(",")) + "，请注意"); + return R.error(String.format("本次作废存在商旅发票，以下发票号码未作废:%s，请注意" ,collect2.stream().collect(Collectors.joining(",")) )); } } break; @@ -2201,15 +2201,13 @@ public class OrderInfoServiceImpl implements OrderInfoService { List orderProcessInfos1 = collect.get(s); if(orderProcessInfos1.size() > 1){ //如果全部开具成功再添加否则返回报错信息 - List collect2 = orderProcessInfos1.stream() - .filter(t -> OrderInfoEnum.ORDER_STATUS_5.getKey().equals(t.getDdzt()) || OrderInfoEnum.ORDER_STATUS_7.getKey().equals(t.getDdzt())) - .map(t -> t.getFpqqlsh()).collect(Collectors.toList()); - if(!collect2.isEmpty()){ - yfpqqlsh.addAll(collect2); - }else{ - sb2.append("本次冲红存在商旅发票，，存在未开具成功结算单:" + collect2.stream().collect(Collectors.joining(",")));//结算单号 + int count = (int)orderProcessInfos1.stream() + .filter(t -> OrderInfoEnum.ORDER_STATUS_5.getKey().equals(t.getDdzt()) || OrderInfoEnum.ORDER_STATUS_7.getKey().equals(t.getDdzt())).count(); + if(orderProcessInfos1.size() != count){ + sb2.append(String.format("本次冲红存在商旅发票，报账单:%s存在未开具成功的结算单;",s)); + continue; } - + yfpqqlsh.addAll(orderProcessInfos1.stream().map(t -> t.getFpqqlsh()).collect(Collectors.toList())); } } //直接return ，存在未开具情况不查作废情况了 @@ -2220,7 +2218,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { List invoiceInfos = orderInvoiceInfoMapper.selectInvoiceInfoByFpqqlshs(yfpqqlsh); List collect2 = invoiceInfos.stream().filter(t -> !list.contains(t.getFpdm() + "-" + t.getFphm())).map(t -> t.getFphm()).collect(Collectors.toList()); if(!collect2.isEmpty()){ - return R.error("本次冲红存在商旅发票，以下发票号码未冲红:"+collect2.stream().collect(Collectors.joining(","))+"，请注意"); + return R.error(String.format("本次冲红存在商旅发票，以下发票号码需冲红:%s,请注意;",collect2.stream().collect(Collectors.joining(",")))); } } break;