From 38314a527f1f3bf56953fa06f0a2f1a277345c5c Mon Sep 17 00:00:00 2001 From: wangrangrang Date: Mon, 12 Jun 2023 09:38:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/manager/service/impl/InvoiceServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java index 9b2b1a46..e34cc222 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java @@ -192,7 +192,8 @@ public class InvoiceServiceImpl implements InvoiceService { //成品油和非成品油混合 PageOrderInfo cpyPageOrderInfo = new PageOrderInfo(); BeanUtils.copyProperties(commonOrderInfo.getOrderInfo(),cpyPageOrderInfo); - cpyPageOrderInfo.setKphjje(cpyOrderItems.stream().map(m->new BigDecimal(m.getSe()).add(new BigDecimal(m.getXmje()))).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); List cpyOrderItemInfo = new ArrayList(); + cpyPageOrderInfo.setKphjje(cpyOrderItems.stream().map(m->new BigDecimal(m.getSe()).add(new BigDecimal(m.getXmje()))).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); + List cpyOrderItemInfo = new ArrayList(); for (OrderItemInfo cpyOrderItem : cpyOrderItems) { PageOrderItemInfo pageOrderItemInfo = new PageOrderItemInfo(); BeanUtils.copyProperties(cpyOrderItem,pageOrderItemInfo); @@ -206,7 +207,8 @@ public class InvoiceServiceImpl implements InvoiceService { //成品油和非成品油混合 PageOrderInfo nocpyPageOrderInfo = new PageOrderInfo(); BeanUtils.copyProperties(commonOrderInfo.getOrderInfo(),nocpyPageOrderInfo); - nocpyPageOrderInfo.setKphjje(nocpyOrderItems.stream().map(m->new BigDecimal(m.getSe()).add(new BigDecimal(m.getXmje()))).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); List nocpyOrderItemInfo = new ArrayList(); + nocpyPageOrderInfo.setKphjje(nocpyOrderItems.stream().map(m->new BigDecimal(m.getSe()).add(new BigDecimal(m.getXmje()))).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); + List nocpyOrderItemInfo = new ArrayList(); for (OrderItemInfo nocpyOrderItem : nocpyOrderItems) { PageOrderItemInfo pageOrderItemInfo = new PageOrderItemInfo(); BeanUtils.copyProperties(nocpyOrderItem,pageOrderItemInfo); From 4e127b6ca4edfb2352e0ad80e461e020b7f3cded Mon Sep 17 00:00:00 2001 From: wangrangrang Date: Mon, 12 Jun 2023 16:05:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=8D=95=E4=B8=80=E8=B5=B7=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=A2=84=E5=88=B6=E5=8F=91=E7=A5=A8=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/service/impl/InvoiceServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java index e34cc222..bacf1dc8 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java @@ -152,9 +152,10 @@ public class InvoiceServiceImpl implements InvoiceService { //存储成品油和非成品油不是混开的结算单 List commonOrderInfoList=new ArrayList(); //存储成品油和非成品油混开的结算单 - List mixCommonOrderInfoList=new ArrayList<>(); + List> lists=new ArrayList<>(); //购方是否为空、税编是否为空校验、成品油校验 for(CommonOrderInfo commonOrderInfo:commonOrderInfos){ + List mixCommonOrderInfoList=new ArrayList<>(); if(StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfNsrsbh()) || StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfMc()) ){ return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"购方信息为空,请补全!"); } @@ -222,12 +223,15 @@ public class InvoiceServiceImpl implements InvoiceService { if(cpyOrderItems.size()>ConfigureConstant.INT_8){ return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"是成品油发票,明细行数不能超过8行,请先进行手动拆分!"); } + lists.add(mixCommonOrderInfoList); } //如果是混开的 走明细拆分 - if(!CollectionUtils.isEmpty(mixCommonOrderInfoList)){ + if(!CollectionUtils.isEmpty(lists)){ try { - orderSplitService.saveOrderSplitOrder(mixCommonOrderInfoList); + for (List list : lists) { + orderSplitService.saveOrderSplitOrder(list); + } } catch (Exception e) { throw new RuntimeException(e.getMessage()); }