From df5f8d4b3006110e11716dc24ae078b1aeb334ef Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 4 Jul 2023 20:26:06 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E6=98=8E=E7=BB=86=E5=90=88?= =?UTF-8?q?=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderMergeServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java index 9ed2cb43..332d695b 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java @@ -932,6 +932,7 @@ public class OrderMergeServiceImpl implements OrderMergeService { @Override public R orderItemMerge(CommonOrderInfo commonOrderInfo, List mergeInItem){ List orderItemInfos = commonOrderInfo.getOrderItemInfo(); + BigDecimal oldhjse = orderItemInfos.stream().map(t -> new BigDecimal(t.getSe())).reduce(BigDecimal::add).get(); OrderInfo orderInfo = commonOrderInfo.getOrderInfo(); //集合求差集，不参与合并的明细 List mergeOutItem = orderItemInfos.stream().filter(t -> !mergeInItem.contains(t)).collect(Collectors.toList()); @@ -1004,9 +1005,8 @@ public class OrderMergeServiceImpl implements OrderMergeService { //对比合计税额的误差，此处将不参与和与参与合并合并对比 BigDecimal hjse = mergeOutItem.stream().map(t -> new BigDecimal(t.getSe())).reduce(BigDecimal::add).get(); - BigDecimal oldhjse = orderItemInfos.stream().map(t -> new BigDecimal(t.getSe())).reduce(BigDecimal::add).get(); - log.info("合并前{}",hjse.toString()); - log.info("合并后{}",oldhjse.toString()); + log.info("合并前{}",oldhjse.toString()); + log.info("合并后{}",hjse.toString()); if((termType && hjse.subtract(oldhjse).abs().doubleValue() > 0.06) || (!termType && hjse.subtract(oldhjse).abs().doubleValue() > 1.27)){ return R.error("合并失败,合并明细后价税合计超过总的误差范围"); }