From 827f1fdecf59c774872a31a79f0748ff24663fb0 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Fri, 21 Jul 2023 14:32:31 +0800 Subject: [PATCH] =?UTF-8?q?feature=201.=E9=80=BB=E8=BE=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/order/consumer/utils/BeanTransitionUtils.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 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 d45169ce..b7336190 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 @@ -3648,17 +3648,17 @@ public class BeanTransitionUtils { if(StringUtils.isNotBlank(ddtxxBO.getXTLY()) && OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(ddtxxBO.getXTLY())){ Map> collect = ddmxList.stream().collect(Collectors.groupingBy(t -> t.getZXBM())); log.info("拆分数据：{}", JSONObject.toJSONString(collect)); - for (int i = 0; i < collect.size(); i++) { + for (Map.Entry> listEntry : collect.entrySet()) { + List ddmxxxBOS = listEntry.getValue(); DdzxxBO ddzxxBONew = new DdzxxBO(); DdtxxBO ddtxxBONew = new DdtxxBO(); List ddmxLists = new ArrayList<>(); - BeanUtils.copyProperties(ddtxxBO,ddtxxBONew); - List ddmxxxBOS = collect.get(i); + BeanUtils.copyProperties(ddtxxBO, ddtxxBONew); 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())){ + 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); @@ -3677,7 +3677,6 @@ public class BeanTransitionUtils { ddzxxBONew.setDDTXX(ddtxxBO); ddzxxBONew.setDDMXXX(ddmxLists); ddzxxList.add(ddzxxBONew); - } }else{