From 89a1eb96f162a3a3d60c61a6ba436108d8ef7720 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Fri, 21 Jul 2023 13:56:14 +0800 Subject: [PATCH] =?UTF-8?q?feature=201.=E6=8B=86=E5=88=86=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../openapi/api/InvoiceOpenGateRestApi.java | 2 +- .../consumer/utils/BeanTransitionUtils.java | 27 ++++++++++++++++--- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceOpenGateRestApi.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceOpenGateRestApi.java index 6e602c10..c6862a9a 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceOpenGateRestApi.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceOpenGateRestApi.java @@ -107,7 +107,7 @@ public class InvoiceOpenGateRestApi { } catch (Exception e) { e.printStackTrace(); - log.error("{}-处理业务出现异常,异常原因为:{}", LOGGER_MESSAGE_V6, e.getMessage()); + log.error("{}-处理业务出现异常,异常原因为:{}", LOGGER_MESSAGE_V6, e); PoCommonResponseParam poCommonResponseParam = new PoCommonResponseParam(); EsOutput esOutput = new EsOutput(); esOutput.setBSKEY(""); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index 403b779c..62bff920 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -3636,19 +3636,40 @@ public class BeanTransitionUtils { } //如果是山能易行按照物料编码分组拆分订单 - if(StringUtils.isNotBlank(ddtxxBO.getXTLY())){ + if(StringUtils.isNotBlank(ddtxxBO.getXTLY()) && OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(ddtxxBO.getXTLY())){ Map> collect = ddmxList.stream().collect(Collectors.groupingBy(t -> t.getZXBM())); for (int i = 0; i < collect.size(); i++) { DdzxxBO ddzxxBONew = new DdzxxBO(); DdtxxBO ddtxxBONew = new DdtxxBO(); List ddmxLists = new ArrayList<>(); BeanUtils.copyProperties(ddtxxBO,ddtxxBONew); - ddmxLists.addAll(collect.get(i)); + List ddmxxxBOS = collect.get(i); + BigDecimal zje = new BigDecimal("0.00"); + BigDecimal bhsje = new BigDecimal("0.00"); + BigDecimal se = new BigDecimal("0.00"); + for (DdmxxxBO ddmxxxBO : ddmxxxBOS) { + if(StringUtils.isNotBlank(ddmxxxBO.getHSBZ()) && OrderInfoEnum.HSBZ_0.equals(ddmxxxBO.getHSBZ())){ + //不含稅 + BigDecimal bigDecimal = new BigDecimal(ddmxxxBO.getJE()).add(new BigDecimal(ddmxxxBO.getSE())); + zje = zje.add(bigDecimal); + bhsje = bhsje.add(new BigDecimal(ddmxxxBO.getJE())); + se = se.add(new BigDecimal(ddmxxxBO.getSE())); + } else { + //含稅 + zje = zje.add(new BigDecimal(ddmxxxBO.getJE())); + } + } + ddtxxBO.setHJJE(bhsje.toPlainString()); + ddtxxBO.setHJSE(se.toPlainString()); + ddtxxBO.setJSHJ(zje.toPlainString()); + ddmxLists.addAll(ddmxxxBOS); ddzxxBONew.setDDTXX(ddtxxBO); - ddzxxBONew.setDDMXXX(ddmxList); + ddzxxBONew.setDDMXXX(ddmxLists); ddzxxList.add(ddzxxBONew); + } + }else{ ddzxxBO.setDDTXX(ddtxxBO); ddzxxBO.setDDMXXX(ddmxList);