From d55fc66b169fa12b40d4a683b41921db9efc5562 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Thu, 25 May 2023 16:20:36 +0800 Subject: [PATCH] =?UTF-8?q?feature=201.=E5=A6=82=E6=9E=9C=E9=83=BD?= =?UTF-8?q?=E6=98=AF=E5=90=AB=E7=A8=85=E6=95=B8=E6=93=9A=E9=80=B2=E8=A1=8C?= =?UTF-8?q?=E4=BB=B7=E7=A8=8E=E5=88=86=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../consumer/utils/BeanTransitionUtils.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) 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 d52a6713..3c90163c 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 @@ -3545,13 +3545,13 @@ public class BeanTransitionUtils { if(StringUtils.isNotBlank(detail.getZZSE()) && StringUtils.isNotBlank(detail.getZBHSJE())){ String zje = DecimalCalculateUtil.bigDecimalAdd(detail.getZZSE(), detail.getZBHSJE()); if(DecimalCalculateUtil.stringCompare(zje,detail.getZHSJE()) != 0){ - ddmxxxBO.setJE(detail.getZBHSJE()); - ddmxxxBO.setHSBZ(ConfigureConstant.STRING_0); - ddmxxxBO.setSE(detail.getZZSE()); - }else { log.info("SAP推送的不含税金额+税额不相等,传入的总金额:{},计算后的XMJE:{}",detail.getZHSJE(),zje); ddmxxxBO.setJE(detail.getZHSJE()); ddmxxxBO.setHSBZ(ConfigureConstant.STRING_1); + }else { + ddmxxxBO.setJE(detail.getZBHSJE()); + ddmxxxBO.setHSBZ(ConfigureConstant.STRING_0); + ddmxxxBO.setSE(detail.getZZSE()); } } else { ddmxxxBO.setJE(detail.getZHSJE()); @@ -3577,6 +3577,11 @@ public class BeanTransitionUtils { } ddmxList.add(ddmxxxBO); } + boolean match = ddmxList.stream().allMatch(mx -> ConfigureConstant.STRING_1.equals(mx.getHSBZ())); + if(match){ + ddtxxBO.setHJJE("0"); + ddtxxBO.setHJSE("0"); + } } ddzxxBO.setDDTXX(ddtxxBO); ddzxxBO.setDDMXXX(ddmxList); @@ -3588,8 +3593,8 @@ public class BeanTransitionUtils { } public static void main(String[] args) { - String zje = DecimalCalculateUtil.bigDecimalAdd("60561.96", "465861.19"); - if(DecimalCalculateUtil.stringCompare(zje,"526423.15") != 0){ + String zje = DecimalCalculateUtil.bigDecimalAdd("2", "1"); + if(DecimalCalculateUtil.stringCompare(zje,"3") != 0){ System.out.println("00"); } System.out.println("988989");